undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-merge: Exit with code 2 if no strategy was able to handle the merge.

Browse Source 
This way it is possible to test in scripts if the merge was non-clean
or if the strategy had other problems with the merge.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2005-12-03 11:40:21 +01:00 committed by Junio C Hamano
parent 56b5e946f2
commit 4275df5170
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-merge.sh
View File

@ -273,7 +273,8 @@ fi
case "$best_strategy" in
'')
restorestate
die "No merge strategy handled the merge."
echo >&2 "No merge strategy handled the merge."
exit 2
;;
"$wt_strategy")
# We already have its result in the working tree.