summaryrefslogtreecommitdiffstats
path: root/pkg/gui/mergeconflicts/find_conflicts_test.go
AgeCommit message (Expand)Author
2022-01-26improve merge conflict flowJesse Duffield
2021-08-25Support `git config merge.conflictStyle diff3`Ryooooooga
2021-06-02refactorJesse Duffield