diff options
| author |  Phil Hord <hordp@cisco.com> | 2012-07-10 18:52:27 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-08-17 10:56:19 -0700 |
| commit | 79dc2d0b0250b4a90dfc83ae69c116e08c9df0a3 (patch) | |
| tree | a3bec74dae9380e4ab2ebd87ef52ac7420900d39 /Documentation/gitmodules.txt | |
| parent | Git 1.7.9.7 (diff) | |
| download | tgif-79dc2d0b0250b4a90dfc83ae69c116e08c9df0a3.tar.xz | |
test: git-stash conflict sets up rerere
Add a test to make sure that a conflicted "stash apply" invokes
rerere to record the conflicts and resolve the the files it can
(the current code doesn't, so the test is marked as failing).
Without correct state recorded for rerere, mergetool may be
confused, causing it to think no files have conflicts even though
they do. This condition is not verified by this test since a
subsequent commit will change the behavior to enable rerere for
stash conflicts.
Also, the next test expected us to finish up with a reset, which is
impossible to do if we fail (as we must) and it's an unreasonable
expectation anyway. Begin the next test with a reset of its own
instead.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitmodules.txt')
0 files changed, 0 insertions, 0 deletions