summaryrefslogtreecommitdiffstats
path: root/pkg/gui/mergeconflicts
AgeCommit message (Expand)Author
2022-01-27better locking of merge panel stateJesse Duffield
2022-01-26improve merge conflict flowJesse Duffield
2021-08-25Address feedbackJesse Duffield
2021-08-25Minor refactorJesse Duffield
2021-08-25Fix `pick all hunks`Ryooooooga
2021-08-25simplify merge panel logicRyooooooga
2021-08-25add mergeConflict#hasAncestorRyooooooga
2021-08-25Fix conflict resolutionRyooooooga
2021-08-25Support `git config merge.conflictStyle diff3`Ryooooooga
2021-08-21Fix panic in merge conflictRyooooooga
2021-08-01color fixupsJesse Duffield
2021-07-31simplify code a bitJesse Duffield
2021-07-30Switch to github.com/gookit/color for terminal colorsmjarkk
2021-06-05prevent closure issueJesse Duffield
2021-06-05not importing regexpJesse Duffield
2021-06-05more explicitJesse Duffield
2021-06-05Discard value after END markerCristian Betivu
2021-06-05More generic merge conflict detectionCristian Betivu
2021-06-02refactorJesse Duffield
2021-05-30Handle alternate merge conflict format; add testsHarrison Jones
2021-04-18refactor merge panelJesse Duffield
2021-04-02refactorJesse Duffield
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 12:33:57 +0000