![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800) | ||
| commit | 695bf722da848e0cd2692bc07c4a2773c52b4216 | |
| tree | fdee9c1ff82b2e40dfcdddc0c02a3792c36aba70 | tree | snapshot |
| parent | bb5ebed731378f9ebec9bcd438aa69e086d73359 | commit | diff |
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 | diff | blob | history |