X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=9ee3f804520eadb322de3d0ea70a2bf9f092b089;hb=c1ce83a5b64618a8a4ac313da82c156558cbe259;hp=1e7727d2763e744b94f55c2056eccaab12367c9e;hpb=c576304d512df18fa30b91bb3ac15478d5d4dfb1;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 1e7727d27..9ee3f8045 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -80,6 +80,10 @@ case "${1:-.}${2:-.}${3:-.}" in
 		echo "ERROR: $4: Not merging symbolic link changes."
 		exit 1
 		;;
+	*,160000,*)
+		echo "ERROR: $4: Not merging conflicting submodule changes."
+		exit 1
+		;;
 	esac
 
 	src2=`git-unpack-file $3`