diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-03 13:04:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-03 13:04:54 -0800 |
| commit | 7d79c860a6e2a8ceee10039153b47f0a8580607d (patch) | |
| tree | 44e8371528b304b0cf8eaa65097006f8a7867876 /COPYING | |
| parent | builtin-archive: use RUN_SETUP (diff) | |
| download | tgif-7d79c860a6e2a8ceee10039153b47f0a8580607d.tar.xz | |
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions