From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jul 2019 21:27:15 +0000 (-0700)
Subject: Merge branch 'sw/git-p4-unshelve-branched-files' into maint
X-Git-Tag: v2.23.0-rc0~6^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2

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
---

fe3ec21fb03e7d02d00fc845e7a7d3e692bb67a2