Andrew's git / gitweb.git / diff
?
Merge branch 'jc/merge-saner-messages'
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700)
* jc/merge-saner-messages:
merge-recursive: give less scary messages when merge did not start

Trivial merge