+".$2." | "..$3" | ".$2$2")
+ mv $(unpack-file "${2:-$3}") $4
+ update-cache --add -- $4
+ exit 0
+ ;;
+
+#
+# Modified in both, but differently ;(
+#
+"$1$2$3")
+ echo "Auto-merging $4"
+ orig=$(unpack-file $1)
+ src1=$(unpack-file $2)
+ src2=$(unpack-file $3)
+ merge "$src2" "$orig" "$src1"
+ if [ $? -ne 0 ]; then
+ echo Leaving conflict merge in $src2
+ exit 1
+ fi
+ cp "$src2" "$4" && update-cache --add -- "$4" && exit 0
+ ;;
+
+*)
+ echo "Not handling case $1 -> $2 -> $3"
+ ;;
+esac
+exit 1