Age | Commit message (Expand) | Author |
---|---|---|
2021-08-25 | Address feedback | Jesse Duffield |
2021-08-25 | Minor refactor | Jesse Duffield |
2021-08-25 | Fix `pick all hunks` | Ryooooooga |
2021-08-25 | simplify merge panel logic | Ryooooooga |
2021-08-25 | add mergeConflict#hasAncestor | Ryooooooga |
2021-08-25 | Fix conflict resolution | Ryooooooga |
2021-08-25 | Support `git config merge.conflictStyle diff3` | Ryooooooga |
2021-08-21 | Fix panic in merge conflict | Ryooooooga |
2021-08-01 | color fixups | Jesse Duffield |
2021-07-31 | simplify code a bit | Jesse Duffield |
2021-07-30 | Switch to github.com/gookit/color for terminal colors | mjarkk |
2021-06-05 | prevent closure issue | Jesse Duffield |
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-05 | More generic merge conflict detection | Cristian Betivu |
2021-06-02 | refactor | Jesse Duffield |
2021-05-30 | Handle alternate merge conflict format; add tests | Harrison Jones |
2021-04-18 | refactor merge panel | Jesse Duffield |
2021-04-02 | refactor | Jesse Duffield |