From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Jun 2019 17:15:18 +0000 (-0700)
Subject: Merge branch 'sw/git-p4-unshelve-branched-files'
X-Git-Tag: v2.23.0-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff?hp=--cc

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

"git p4" update.

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

e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff