Age | Commit message (Expand) | Author |
---|---|---|
2024-05-15 | Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLines | Stefan Haller |
2022-03-19 | update linters | Jesse Duffield |
2022-01-26 | improve merge conflict flow | Jesse Duffield |
2021-08-25 | Support `git config merge.conflictStyle diff3` | Ryooooooga |
2021-08-21 | Fix panic in merge conflict | Ryooooooga |
2021-06-05 | not importing regexp | Jesse Duffield |
2021-06-05 | more explicit | Jesse Duffield |
2021-06-05 | Discard value after END marker | Cristian Betivu |
2021-06-02 | refactor | Jesse Duffield |