Merge branch 'sw/git-p4-unshelve-branched-files'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:18 +0000 (10:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Jun 2019 17:15:18 +0000 (10:15 -0700)
"git p4" update.

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

1  2 
t/t9832-unshelve.sh

Simple merge