Anonymous avatar Anonymous committed 718135e

Clarify kind of conflict in merge-one-file helper

Not as verbose as the recursive merge driver, but better still.

Signed-off-by: Alex Riesen <>;
Signed-off-by: Junio C Hamano <>;

Comments (0)

Files changed (1)

 	src1=`git-unpack-file $2`
 	git merge-file "$src1" "$orig" "$src2"
+	msg=
+	if [ $ret -ne 0 ]; then
+		msg='content conflict'
+	fi
 	# Create the working tree file, using "our tree" version from the
 	# index, and then store the result of the merge.
 	rm -f -- "$orig" "$src1" "$src2"
 	if [ "$6" != "$7" ]; then
-		echo "ERROR: Permissions conflict: $5->$6,$7."
+		if [ -n "$msg" ]; then
+			msg="$msg, "
+		fi
+		msg="${msg}permissions conflict: $5->$6,$7"
 	if [ "$1" = '' ]; then
 	if [ $ret -ne 0 ]; then
-		echo "ERROR: Merge conflict in $4"
+		echo "ERROR: $msg in $4"
 		exit 1
 	exec git update-index -- "$4"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.