Merge branch 'ld/p4-update-shelve' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:14 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:14 +0000 (10:57 -0800)
commit22f6bec94c49eae174cbea4cb4f1c362e5ae6add
treed4549bcba9170509d4fc80e6ac888760f5d4c9b7
parent54188ab23cd100d3e8113a42abb531f575f57d63
parent46c609e9ffdbf8d9aba096836386b57371ed16b8
Merge branch 'ld/p4-update-shelve' into next

* ld/p4-update-shelve:
  git-p4: support updating an existing shelved changelist