diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 11:55:16 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-25 12:15:21 +0100 |
| commit | d7f555bf5c00a135d3991e9829450c4de73cafaa (patch) | |
| tree | 43578ff961a56999c176244973d266cf57f7231d /dgit | |
| parent | 683ef14506d9907dfa102b5e228637415c4922b6 (diff) | |
test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches
We are about to extend the set of situations where dgit runs
git-debrebase make-patches, with the result that the patch commit in
this conflict will be made by gdr.
This is good, so allow it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
0 files changed, 0 insertions, 0 deletions