summaryrefslogtreecommitdiffstats
path: root/test
AgeCommit message (Expand)Author
2018-07-21better handling of merge conflictsJesse Duffield
2018-07-21updating docJesse Duffield
2018-07-21test script to make repo with a merge conflictJesse Duffield
2018-06-05remove test filesJesse Duffield
2018-05-21"test"Jesse Duffield