Merge branch 'jk/merge-rename-ux'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (23:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:23:56 +0000 (23:23 -0700)
commit0ce6a51...43815a34d0dbebaa799b32a83d1ea4f9
tree999ed87...9453af4848bf98a3341ceaf0801c6f95copy hash to clipboard (tree)
parentedf9d71...d1d05c1eb4f652782febfdfede212648copy hash to clipboard (diff)
parentbebd2fd...7d385f198017fe297a6c79e26b2bf61ccopy hash to clipboard (diff)
builtin/commit.c
builtin/merge.c
diff.c
diff.h
diffcore-rename.c
git-pull.sh
merge-recursive.c
merge-recursive.h