summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-03-19 09:06:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-19 20:30:14 (GMT)
commit2b1c0ef2e5d103efacb535f32fb142114490dc33 (patch)
treef65feef3d90bcbe4b8530810fdc58f72bfb751a1 /sha1_file.c
parent75a8180d4b6939aca03b2c6320f128469abd5879 (diff)
downloadgit-2b1c0ef2e5d103efacb535f32fb142114490dc33.zip
git-2b1c0ef2e5d103efacb535f32fb142114490dc33.tar.gz
git-2b1c0ef2e5d103efacb535f32fb142114490dc33.tar.bz2
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions