Merge branch 'sw/git-p4-unshelve-branched-files' into maint

"git p4" update.

* sw/git-p4-unshelve-branched-files:
  git-p4: allow unshelving of branched files

1 files changed, 1 insertions, 1 deletions

diff --git a/git-p4.py b/git-p4.py
index 0b5bfcbc5e..c71a6832e2 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1309,7 +1309,7 @@ class GitLFS(LargeFileSystem):
 
 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]"