diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 18:28:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:11:09 +0100 |
| commit | ca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28 (patch) | |
| tree | d1563c1e4b7c586ebc2a6987cfff8d8ff09f8de3 /tests | |
| parent | 952a781025083b34762fe6bb2093ef64524c23cd (diff) | |
git-debrebase: merge: Always save wreckage
There is no point configuring this. We tidy it up again soon enough.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 22cd328..48ed991 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -54,7 +54,7 @@ junkref=refs/debrebase-wreckage/junk git update-ref $junkref v2.1 t-expect-fail F:'divergent anchors' \ -t-git-debrebase --save-wreckage +t-git-debrebase test '' = "$(t-git-get-ref-exact $junkref)" |