From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 22:41:55 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.0-rc1~232
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b8950769b8b91d634ec549fd1af792ccc1864f79;hp=ba580aeafb52921025de1efe1c50db34393f9907;p=git.git

Merge branch 'maint'

* maint:
  pre-commit hook: complain about conflict markers.
  git-merge: a bit more readable user guidance.
---

diff --git a/git-merge.sh b/git-merge.sh
index 78ab422e..b834e79c 100755
--- 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
index 43d3b6ef..723a9ef2 100644
--- 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);