Merge branch 'ld/p4-update-shelve'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
* ld/p4-update-shelve:
git-p4: support updating an existing shelved changelist

Trivial merge