![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Sep 2009 08:33:15 +0000 (01:33 -0700) | ||
| commit | 8b54f63dce34c3bbd7ff919fb53c1c253221fe71 | |
| tree | 8e540c253e699f1de5276fd96194f9df82f18fe3 | tree | snapshot |
| parent | 1cdd64e8000716945e1cb96c46a4273a2db0ec74 | commit | diff |
| parent | fadd069d036c9d376769692e2726c5a1600d281c | commit | diff |
Merge branch 'jc/merge-saner-messages'
* jc/merge-saner-messages:
merge-recursive: give less scary messages when merge did not start
* jc/merge-saner-messages:
merge-recursive: give less scary messages when merge did not start