Reintegrate: do not fail when garbage is found in the orignal
Junio C Hamano committed
May 3, 2010 at 13:34 UTC
47dc5e28f2c3aeceeab6155162dea4daeb149f5d
1 file changed
+1
-1
Reintegrate
+1
-1
@@ -91,7 +91,7 @@ show_merge () {
91
;;
92
*)
93
echo 2>&1 "Huh?: $msg"
94
- exit 1
94
+ return
95
;;
96
esac &&
97
tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&