![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
| Tue, 28 Dec 2010 09:30:45 +0000 (10:30 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 28 Dec 2010 23:05:41 +0000 (15:05 -0800) | ||
| commit | 6baafd848e7c238aecab4cc5ffb89a4293fcb964 | |
| tree | ead35d54ea6fbd9eed0612003ded907e7cf9a6c4 | tree | snapshot |
| parent | ade88e11b8b0c7bfcad8ebb6a71a0786552f7eb2 | commit | diff |
rebase -m: don't print exit code 2 when merge fails
When the merge strategy fails, a message suggesting the user to try
another strategy is displayed. Remove the "$rv" (which is always equal
to "2" in this case) from that message.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When the merge strategy fails, a message suggesting the user to try
another strategy is displayed. Remove the "$rv" (which is always equal
to "2" in this case) from that message.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--merge.sh | diff | blob | history |