chiark / gitweb /
git-debrebase: merge: Always save wreckage
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:28:59 +0000 (18:28 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000 (20:11 +0100)
commitca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28
treed1563c1e4b7c586ebc2a6987cfff8d8ff09f8de3
parent952a781025083b34762fe6bb2093ef64524c23cd
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>
git-debrebase
tests/tests/gdr-merge-conflicts