projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 860f70f f26af3f)
Merge branch 'tr/merge-edit-guidance' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Feb 2012 23:31:50 +0000 (15:31 -0800)
* tr/merge-edit-guidance:
  merge: add instructions to the commit message when editing

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge.c
Simple merge
Git—the stupid content tracker