Merge branch 'maint'

* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.
git-mirror · Apr 19, 2006 · b895076 · b895076
2 parents ba580ae + 61c2bcb
commit b895076
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/git-merge.sh b/git-merge.sh
@@ -335,5 +335,5 @@ Conflicts:
 	then
 		git-rerere
 	fi
-	die "Automatic merge failed; fix up by hand"
+	die "Automatic merge failed; fix conflicts and then commit the result."
 fi
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
@@ -61,6 +61,9 @@ perl -e '
 	    if (/^\s* 	/) {
 		bad_line("indent SP followed by a TAB", $_);
 	    }
+	    if (/^(?:[<>=]){7}/) {
+		bad_line("unresolved merge conflict", $_);
+	    }
 	}
     }
     exit($found_bad);