summaryrefslogtreecommitdiffstats
path: root/pkg/gui/mergeconflicts/find_conflicts.go
AgeCommit message (Expand)Author
2024-05-15Use ScanLinesAndTruncateWhenLongerThanBuffer instead of bufio.ScanLinesStefan Haller
2022-03-19update lintersJesse Duffield
2022-01-26improve merge conflict flowJesse Duffield
2021-08-25Support `git config merge.conflictStyle diff3`Ryooooooga
2021-08-21Fix panic in merge conflictRyooooooga
2021-06-05not importing regexpJesse Duffield
2021-06-05more explicitJesse Duffield
2021-06-05Discard value after END markerCristian Betivu
2021-06-02refactorJesse Duffield