| commit | 695bf722da848e0cd2692bc07c4a2773c52b4216 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 23 Dec 2005 23:48:09 +0000 (23 15:48 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 23 Dec 2005 23:48:09 +0000 (23 15:48 -0800) | ||
| tree | fdee9c1ff82b2e40dfcdddc0c02a3792c36aba70 | treesnapshot (tar.gz zip) |
| parent | bb5ebed731378f9ebec9bcd438aa69e086d73359 | commitdiff |
merge --no-commit: tweak message
We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed. Tell
these cases apart and phrase dying message differently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed. Tell
these cases apart and phrase dying message differently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diffblobblamehistory |