diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:05 -0700 |
| commit | 541b9cf1463334b1984a0b78a7180246415cb477 (patch) | |
| tree | dca0ebe9f75365e4b35ea44488dca0010afd0496 /mergetools/p4merge | |
| parent | Merge branch 'bk/submodule-in-recursive-merge' (diff) | |
| parent | Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pi... (diff) | |
| download | tgif-541b9cf1463334b1984a0b78a7180246415cb477.tar.xz | |
Merge branch 'js/no-cherry-pick-head-after-punted'
* js/no-cherry-pick-head-after-punted:
cherry-pick: do not give irrelevant advice when cherry-pick punted
revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions