app: Add a git cola merge sub-command

Signed-off-by: David Aguilar <davvid@gmail.com>

Author: davvid

cola/app.py

@@ -187,6 +187,7 @@ def parse_args(context):
                     'dag',
                     'fetch',
                     'grep',
+                    'merge',
                     'pull',
                     'push',
                     'remote',
@@ -324,6 +325,10 @@ def main(context):
     elif context == 'grep':
         from cola.widgets import grep
         view = grep.run_grep(parent=None)
+    elif context == 'merge':
+        from cola.merge import view
+        model.update_status()
+        view = view.MergeView(model, parent=None)
     elif context == 'pull':
         from cola.widgets import remote
         model.update_status()

share/doc/git-cola/git-cola.txt

@@ -49,6 +49,9 @@ fetch::
 grep::
 	Use `git grep` to search for content.
 
+merge::
+	Merge branches.
+
 pull::
 	Fetch and merge remote branches.
 

share/doc/git-cola/relnotes.rst

@@ -18,6 +18,8 @@ Usability, bells and whistles
 
   http://github.com/git-cola/git-cola/issues/140
 
+* A new `git cola merge` sub-command was added for merging branches.
+
 * Less blocking in the main UI
 
 Fixes