diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-23 15:48:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-23 15:48:09 -0800 |
| commit | 695bf722da848e0cd2692bc07c4a2773c52b4216 (patch) | |
| tree | fdee9c1ff82b2e40dfcdddc0c02a3792c36aba70 /Documentation | |
| parent | bb5ebed731378f9ebec9bcd438aa69e086d73359 (diff) | |
| download | git-695bf722da848e0cd2692bc07c4a2773c52b4216.tar.gz git-695bf722da848e0cd2692bc07c4a2773c52b4216.tar.xz | |
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions