Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"

Instead of showing a warning and working as before, fail and show
the message and force immediate upgrade from their upstream
repositories when these tools are run, per request from their
primary author.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Git 2.0-rc4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Revert "Merge branch 'fc/remote-helpers-hg-bzr-graduation' into next"

This reverts commit fed170a88d80b370037611b0a01f3c54d3aca567, reversing
changes made to e6d92d749cc86dc402a9e9f0fa47eb3e532c4906.
Revert "Merge branch 'fc/remote-helper-fixes' into next"

This reverts commit 180482edbaf546d8bf4f0333ee5b02a8dc49fbb9, reversing
changes made to 0e5fec003bf21d5aca647edd27da82b2bfd80a2b.
Merge branch 'master' into next

* master:
  Git 2.0-rc4
  RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles
  Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"
git-merge: Honor pre-merge hook

git-merge does not honor the pre-commit hook when doing automatic merge
commits, and for compatibility reasons this is going to stay.

Introduce a pre-merge hook which is called for an automatic merge commit
just like pre-commit is called for a non-automatic merge commit (or any
other commit).
merge: --no-verify to bypass pre-merge hook

Analogous to commit, introduce a '--no-verify' option which bypasses the
pre-merge hook. The shorthand '-n' is taken by the (non-existing)
'--no-stat' already.
t7503: add tests for pre-merge-hook

Add tests which make sure that the pre-merge-hook is called when
present, allows/disallows merge commits depending on its return value
and is suppressed by "--no-verify".