Instead of leaving the path unmerged in a case where each side
adds different version of the same path, attempt to merge it
with empty base and leave "our" version in the index file, just
like we do for the case in conflicting merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-# Added in both (check for same permissions).
+# Added in both, identically (check for same permissions).
#
".$3$2")
if [ "$6" != "$7" ]; then
#
".$3$2")
if [ "$6" != "$7" ]; then
#
# Modified in both, but differently.
#
#
# Modified in both, but differently.
#
-"$1$2$3")
- echo "Auto-merging $4."
- orig=`git-unpack-file $1`
+"$1$2$3" | ".$2$3")
+ case "$1" in
+ '')
+ echo "Added $4 in both, but differently."
+ orig=`git-unpack-file $2`
+ : >$orig
+ ;;
+ *)
+ echo "Auto-merging $4."
+ orig=`git-unpack-file $1`
+ ;;
+ esac
src2=`git-unpack-file $3`
# We reset the index to the first branch, making
src2=`git-unpack-file $3`
# We reset the index to the first branch, making
echo "ERROR: Permissions conflict: $5->$6,$7."
ret=1
fi
echo "ERROR: Permissions conflict: $5->$6,$7."
ret=1
fi
+ if [ "$1" = '' ]; then
+ ret=1
+ fi
if [ $ret -ne 0 ]; then
echo "ERROR: Merge conflict in $4."
if [ $ret -ne 0 ]; then
echo "ERROR: Merge conflict in $4."