Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-07-22 | update options | Jesse Duffield | |
2018-07-21 | better handling of merge conflicts | Jesse Duffield | |
2018-07-21 | merge with develop | Jesse Duffield | |
2018-07-21 | fix up code that was used to test this very application (yes I'm ashamed) | Jesse Duffield | |
2018-06-10 | this will cause a conflict | Jesse Duffield | |
2018-06-10 | scroll to merge conflict | Jesse Duffield | |
2018-06-09 | add support for merging | Jesse Duffield | |