diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
| commit | 97c138fe4e5762495310e47c7b9e65e8f07af2c2 (patch) | |
| tree | 47721c65ae4235d6f8306c2d39f98c40c388707c /builtin/merge-tree.c | |
| parent | Merge branch 'da/mergetool-trust-exit-code' (diff) | |
| parent | git-p4: allow submit to create shelved changelists. (diff) | |
| download | tgif-97c138fe4e5762495310e47c7b9e65e8f07af2c2.tar.xz | |
Merge branch 'vk/p4-submit-shelve'
* vk/p4-submit-shelve:
git-p4: allow submit to create shelved changelists.
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions