diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 07dfeb8df4..b8bab75485 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -112,8 +112,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	case "$1" in
 	'')
 		echo "Added $4 in both, but differently."
-		orig=$(git-unpack-file $2)
-		create_virtual_base "$orig" "$src2"
+		orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
 		;;
 	*)
 		echo "Auto-merging $4"