summaryrefslogtreecommitdiffstats
path: root/test/repos/merge_conflict.sh
AgeCommit message (Expand)Author
2019-03-16allow autostashing changes when checking out a branchJesse Duffield
2019-03-02use sh intead of bash for the sake of testing on the docker imageJesse Duffield
2019-02-24improve script for making a test repoJesse Duffield Duffield
2018-12-11more work on rebasing including visual indicatorsJesse Duffield
2018-08-28dont panic when catting directoriesJesse Duffield
2018-08-19add user email and config to test repo generatorsJesse Duffield
2018-08-12rearrange test repo generatorsJesse Duffield