[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Don’t run smerge multiple times

From: Matthew Bauer
Subject: [PATCH] Don’t run smerge multiple times
Date: Tue, 11 Feb 2020 13:55:48 -0500

autorevert ends up calling vc-git-find-file-hook multiple times. When
this happens, smerge restarts and goes to the next hunk. This is not
desired when in the middle of an edit. To fix, don’t start smerge when
smerge is already enabled.

Related to https://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02201.html

Attached is a patch that avoids this bug.


Attachment: 0001-Don-t-run-smerge-multiple-times.patch
Description: Text Data

reply via email to

[Prev in Thread] Current Thread [Next in Thread]