Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint

diff --git a/git-p4.py b/git-p4.py
index 0b5bfcbc5e3f9db6f60848069cb62db0694fa5e5..c71a6832e2fa0a632dc93155d0fa2b727c659f5e 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -1309,7 +1309,7 @@ def processContent(self, git_mode, relPath, contents):
 
 class Command:
     delete_actions = ( "delete", "move/delete", "purge" )
-    add_actions = ( "add", "move/add" )
+    add_actions = ( "add", "branch", "move/add" )
 
     def __init__(self):
         self.usage = "usage: %prog [options]"