merge-recursive: give less scary messages when merge did not start
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 05:43:11 +0000 (22:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2009 21:46:36 +0000 (14:46 -0700)
commitfadd069...036c9d376769692e2726c5a1600d281c
treeb72aa42...2a29224fbac342dfd48aaa8c3ea6485dcopy hash to clipboard (tree)
parent5ad9dce...e691106fecde413de8cc321b937367a6copy hash to clipboard (diff)
merge-recursive.c