Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-07-21 | better handling of merge conflicts | Jesse Duffield | |
2018-07-21 | updating doc | Jesse Duffield | |
2018-07-21 | test script to make repo with a merge conflict | Jesse Duffield | |
2018-06-05 | remove test files | Jesse Duffield | |
2018-05-21 | "test" | Jesse Duffield | |