chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 683ef14) | patch
test suite: gdr-diverge-nmu-dgit: Tolerate gdr-generated patches
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 10:55:16 +0000 (11:55 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 25 Aug 2018 11:15:21 +0000 (12:15 +0100)
commitd7f555bf5c00a135d3991e9829450c4de73cafaa
tree43578ff961a56999c176244973d266cf57f7231dtree | snapshot
parent683ef14506d9907dfa102b5e228637415c4922b6commit | 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>
tests/tests/gdr-diverge-nmu-dgit diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.