diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:25:18 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:45:44 +0100 |
| commit | 63ddbee7d0c3bdfaf34cce3950c1a80fb97602c8 (patch) | |
| tree | 1f1e25261411913e17210287b5384bb51d954b19 /dgit.7 | |
| parent | 6a7d91dc81cbc8922bebc4930991902a9a00da79 (diff) | |
git-debrebase: merge: Actually use merge resolutions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.7')
0 files changed, 0 insertions, 0 deletions