Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-02-25 | migrate patch building tests | Jesse Duffield | |
2022-08-07 | move merge conflicts code into controller | Jesse Duffield | |
2022-05-07 | more documentation | Jesse Duffield | |
2022-04-06 | feat(merge_panel): Add open/edit files in merge conflict panel | Ryooooooga | |
2022-03-19 | update linters | Jesse Duffield | |
2022-03-17 | move more view model logic into the files view model | Jesse Duffield | |
2022-01-27 | better locking of merge panel state | Jesse Duffield | |
2022-01-26 | improve merge conflict flow | 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-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 | |