diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 18:32:56 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-26 01:20:43 +0100 |
| commit | 30a7ead54a9ca133f1f0d7ac7c3836d9e6fb86a1 (patch) | |
| tree | 80ed2094c35b82e1e1319900473c2bdfd7a16966 /Makefile | |
| parent | 8273a14340edc80b2a71815c8a0e6149f9b8392a (diff) | |
git-debrebase: gdr-merge-conflicts: Call git merge --no-edit
The default seems different in my sid chroot.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions