diff options
| author |  Pete Wyckoff <pw@padd.com> | 2011-12-17 12:39:03 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-12-17 18:20:27 -0800 |
| commit | d16520499d2652b5b59dfb25f9cf2d56a4c6913a (patch) | |
| tree | 874bde050ffa44e1b4945e76ec9d0c923f45818d /Documentation/git-merge.txt | |
| parent | Update draft release notes to 1.7.9 (diff) | |
| download | tgif-d16520499d2652b5b59dfb25f9cf2d56a4c6913a.tar.xz | |
git-p4: fix skipSubmitEdit regression
Commit 7c766e5 (git-p4: introduce skipSubmitEdit, 2011-12-04)
made it easier to automate submission to p4, but broke the most
common case.
Add a test for when the user really does edit and save the change
template, and fix the bug that causes the test to fail.
Also add a confirmation message when submission is cancelled.
Reported-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions