to make the output more friendly to mouse copy-paste.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;;
*)
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;;
*)
- echo "Auto-merging $4."
orig=`git-unpack-file $1`
;;
esac
orig=`git-unpack-file $1`
;;
esac
fi
if [ $ret -ne 0 ]; then
fi
if [ $ret -ne 0 ]; then
- echo "ERROR: Merge conflict in $4."
+ echo "ERROR: Merge conflict in $4"
exit 1
fi
exec git-update-index -- "$4"
exit 1
fi
exec git-update-index -- "$4"