Age | Commit message (Expand) | Author |
---|---|---|
2018-08-11 | clean up fixup code | Jesse Duffield |
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 |