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

author Junio C Hamano <gitster@pobox.com>

Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)

committer Junio C Hamano <gitster@pobox.com>

Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
author Junio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
committer Junio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
diff --cc git-p4.py
Simple merge
diff --cc t/t9832-unshelve.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jul 2019 21:27:15 +0000 (14:27 -0700)
		1	2
git-p4.py	patch \|	diff1 \|	diff2 \|	blob \| history
t/t9832-unshelve.sh	patch \|	diff1 \|	diff2 \|	blob \| history