summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 17:01:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-11 18:34:50 +0100
commitf8b71fe47b3216f14c31c3c2c9075ce32c0cc975 (patch)
tree90de1efda8f29179a98585b0808b7a0a375fa30c /git-debrebase
parentfad5cfbb7f5309a5f976990883d875e5d38bc000 (diff)
git-debrebase: merge: gdr-merge-conflicts test: New test
Will be improved later. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
0 files changed, 0 insertions, 0 deletions