+".$2." | "..$3" )
+ case "$6$7" in *7??) mode=+x;; *) mode=-x;; esac
+ echo "Adding $4 with perm $mode."
+ exec git-update-cache --add --cacheinfo "$6$7" "$2$3" "$4" ;;
+#
+# Added in both (check for same permissions).
+#
+".$3$2")
+ if [ "$6" != "$7" ]; then
+ echo "ERROR: File $4 added identically in both branches,"
+ echo "ERROR: but permissions conflict $6->$7."
+ exit 1
+ fi
+ case "$6" in *7??) mode=+x;; *) mode=-x;; esac
+ echo "Adding $4 with perm $mode"
+ exec git-update-cache --add --cacheinfo "$6" "$2" "$4" ;;
+#
+# Modified in both, but differently.
+#
+"$1$2$3")
+ echo "Auto-merging $4."
+ orig=`git-unpack-file $1`
+ src1=`git-unpack-file $2`
+ src2=`git-unpack-file $3`
+ merge "$src2" "$orig" "$src1"
+ ret=$?
+ if [ "$6" != "$7" ]; then
+ echo "ERROR: Permissions $5->$6->$7 don't match."
+ fi
+ if [ $ret -ne 0 ]; then
+ echo "ERROR: Leaving conflict merge in $src2."
+ exit 1
+ fi
+ sha1=`git-write-blob "$src2"` || {
+ echo "ERROR: Leaving conflict merge in $src2."
+ }
+ exec git-update-cache --add --cacheinfo "$6" $sha1 "$4" ;;
+*)
+ echo "ERROR: Not handling case $4: $1 -> $2 -> $3" ;;
+esac
+exit 1