gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

in interactive merge, rename ours to current and their to merged.

Browse source 
When rebasing it's not clear which commit is ours, and which is
theirs, the new name should be clearer.
This commit is contained in:
Rémi Vanicat 2009-03-02 10:43:56 +01:00
parent 1eac6b70c6
commit 6d2c6b7d98
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
magit.el
View file

@ -2873,8 +2873,8 @@ Prefix arg means justify as well."
(defun magit-interactive-resolve (file)
(let ((merge-status (magit-git-string "ls-files -u -- %s" file))
(base-buffer (generate-new-buffer (concat file ".base")))
(our-buffer (generate-new-buffer (concat file ".ours")))
(their-buffer (generate-new-buffer (concat file ".theirs")))
(our-buffer (generate-new-buffer (concat file ".current")))
(their-buffer (generate-new-buffer (concat file ".merged")))
(windows (current-window-configuration)))
(if (null merge-status)
(error "Cannot resolge %s" file))