summaryrefslogtreecommitdiffstats
path: root/test/integration/pullMergeConflict
AgeCommit message (Expand)Author
2021-10-22add tests for dealing with remotesJesse Duffield