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> --- git-merge.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 8fb7e4ef2b13f85966976c567cefb6a6d4c18c29 diff --git a/git-merge.sh b/git-merge.sh index d352a3c..a221daa 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -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. -- 0.99.9.GIT - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Dec 03 21:41:02 2005
This archive was generated by hypermail 2.1.8 : 2005-12-03 21:41:08 EST