diff options
| author |  Phil Hord <hordp@cisco.com> | 2012-07-10 18:52:28 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-08-17 10:59:17 -0700 |
| commit | 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 (patch) | |
| tree | 7f5fa1c98bca0b31bce92d861d560ff2bd99b62a /t/t7606-merge-custom.sh | |
| parent | test: git-stash conflict sets up rerere (diff) | |
| download | tgif-743bf6d8b07f0c5717bf5c37b8b50ae9de619c83.tar.xz | |
stash: invoke rerere in case of conflict
"stash apply" directly calls a backend merge function which does not
automatically invoke rerere. This confuses mergetool when leftover
rerere state is left behind from previous merges.
Invoke rerere explicitly when we encounter a conflict during stash
apply. This turns the test introduced by the previous commit to
succeed.
Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions