Andrew's git / gitweb.git / diff
?
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)
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"

Trivial merge