Merge branch 'lh/merge'

* lh/merge:
  git-merge: add --ff and --no-ff options
  git-merge: add support for --commit and --no-squash
  git-merge: add support for branch.<name>.mergeoptions
  git-merge: refactor option parsing
  git-merge: fix faulty SQUASH_MSG
  Add test-script for git-merge porcelain

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-merge.txt
index eae49c4876caf6b2e6a8bd9770b3981fb8133edd,b1771a13c88fa8ec8d5ca6e04c8d5b73bee3209e..bca4212e565c95f79a76a14cc4444e72e472a22c
--- 1/Documentation/git-merge.txt
--- 2/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -56,8 -56,12 +56,12 @@@ merge.verbosity:
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
 -      Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
 +      Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
  
+ branch.<name>.mergeoptions::
+       Sets default options for merging into branch <name>. The syntax and
+       supported options are equal to that of git-merge, but option values
+       containing whitespace characters are currently not supported.
  
  HOW MERGE WORKS
  ---------------

diff --cc git-merge.sh
Simple merge