summaryrefslogtreecommitdiffstats
path: root/test/generate_basic_repo.sh
AgeCommit message (Expand)Author
2018-08-11clean up fixup codeJesse Duffield
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