diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 13:47:59 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:36:23 +0100 |
| commit | 14940a67eb1525d69a8dade2777f8cd11200307c (patch) | |
| tree | 23f9c57e34d02400ecc9f469496f457f709f0a55 /tests/tests/gdr-merge | |
| parent | 965fdfed6e03d38b273baf1fa282a3d2ef828484 (diff) | |
git-debrebase: merge: Avoid asking user to re-merge debian/
If it had conflicts, they will have been resolved earlier and we can
just take that resolution.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-merge')
0 files changed, 0 insertions, 0 deletions