git.el: Added a function to diff against the other heads in a merge.
git-diff-file-merge-head generates a diff against the first merge
head, or with a prefix argument against the nth head. Bound to `d h'
by default.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Alexandre Julliard19 years agocommitted byJunio C Hamano
@ -767,6 +767,16 @@ The default is to fall back to the git repository config, then to `add-log-maili
@@ -767,6 +767,16 @@ The default is to fall back to the git repository config, then to `add-log-maili
"Diff the marked unmerged file(s) against the specified stage."
(let ((files (git-marked-files)))
@ -959,6 +969,7 @@ The default is to fall back to the git repository config, then to `add-log-maili
@@ -959,6 +969,7 @@ The default is to fall back to the git repository config, then to `add-log-maili