chiark / gitweb /
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 17:32:56 +0000 (18:32 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Aug 2018 00:20:43 +0000 (01:20 +0100)
The default seems different in my sid chroot.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

No differences found