| commit | 4efab9805c424097c1accfa6ede2bbadbc9db4a1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Sep 2009 08:00:04 +0000 (11 01:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 11 Sep 2009 08:00:04 +0000 (11 01:00 -0700) | ||
| tree | aca0c97e7314afbe7992e71acc0fabaec2321b2a | treesnapshot (tar.gz zip) |
| parent | cf3eb572b2f47831da8dc6c34cf7e1c517863114 | commitdiff |
| parent | fadd069d036c9d376769692e2726c5a1600d281c | commitdiff |
Merge branch 'jc/merge-saner-messages' into next
* 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