mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
Abort if --rejoin fails.
Thanks to Eduardo Kienetz for noticing this.
This commit is contained in:
parent
942dce5578
commit
ea28d67442
1 changed files with 1 additions and 1 deletions
|
@ -406,7 +406,7 @@ cmd_split()
|
|||
latest_old=$(cache_get latest_old)
|
||||
git merge -s ours \
|
||||
-m "$(merge_msg $dir $latest_old $latest_new)" \
|
||||
$latest_new >&2
|
||||
$latest_new >&2 || exit $?
|
||||
fi
|
||||
echo $latest_new
|
||||
exit 0
|
||||
|
|
Loading…
Reference in a new issue