git-merge: Exit with code 2 if no strategy was able to handle the merge.
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>
Fredrik Kuivinen committed
Dec 3, 2005 at 11:40 UTC
4275df517022604f5c33ba05ae45a885b84e3472
1 file changed
+2
-1
git-merge.sh
+2
-1
@@ -273,7 +273,8 @@ fi
273
case "$best_strategy" in
274
'')
275
restorestate
276
- die "No merge strategy handled the merge."
276
+ echo >&2 "No merge strategy handled the merge."
277
+ exit 2
278
;;
279
"$wt_strategy")
280
# We already have its result in the working tree.