![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800) | ||
| commit | 7d79c860a6e2a8ceee10039153b47f0a8580607d | |
| tree | 44e8371528b304b0cf8eaa65097006f8a7867876 | tree | snapshot |
| parent | 64edf4b2eb19e5b94eda60c0e21d85e45602a8f1 | commit | diff |
git-merge: fail correctly when we cannot fast forward.
When we cannot fast forward the working tree and the current
branch, git-merge did not exit with non-zero status.
Noticed by Larry Streepy, the section to be fixed identfied by
Johannes Schindelin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When we cannot fast forward the working tree and the current
branch, git-merge did not exit with non-zero status.
Noticed by Larry Streepy, the section to be fixed identfied by
Johannes Schindelin.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diff | blob | history |