Merge branch 'jn/merge-no-edit-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:24:02 +0000 (23:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:24:02 +0000 (23:24 -0800)
commit42e283a...bfd0651fd2e6264157ecbe8841511788
treed5b1e12...5c93e4cad18dd37894e8cb7bd2be4adfcopy hash to clipboard (tree)
parent58d4203...a617293d1dc3746a1ea33d84eb766e0fcopy hash to clipboard (diff)
parent3adab6f...a7793253b22a4a7aae34221d19e0236acopy hash to clipboard (diff)