Change the default for git imerge continue to --no-edit

Change the default option for `git imerge continue` and `git imerge
record` to `--no-edit`. The user can always set the new configuration
option `imerge.editmergemessages` to `true` to get the old behavior.

Author: mhagger

README.rst

@@ -260,6 +260,19 @@ merge conflicts to be resolved incorrectly. Therefore, ``git-imerge``
 explicitly turns rerere off temporarily whenever it invokes git.
 
 
+Log messages for pairwise merge commits
+---------------------------------------
+
+When ``git imerge continue`` or ``git imerge record`` finds a resolved
+merge in the working tree, it commits that merge then incorporates it
+into the incremental merge. Usually it just uses Git's autogenerated
+commit message for such commits. If you want to be prompted to edit
+such commit messages, you can either specify ``--edit`` on the command
+line or change the default in your configuration::
+
+    git config --global imerge.editmergemessages true
+
+
 License
 =======
 

git-imerge

@@ -266,7 +266,7 @@ def get_default_edit():
     When 'git imerge continue' or 'git imerge record' finds a user
     merge that can be committed, should it (by default) ask the user
     to edit the commit message? This behavior can be configured via
-    'imerge.editmergemessages'. If it is not configured, return True.
+    'imerge.editmergemessages'. If it is not configured, return False.
 
     Please note that this function is only used to choose the default
     value. It can be overridden on the command line using '--edit' or
@@ -281,7 +281,7 @@ def get_default_edit():
                 ).rstrip()
             ]
     except CalledProcessError:
-        return True
+        return False
 
 
 class UncleanWorkTreeError(Failure):