RSS Bot@lemmy.bestiver.seMB to Hacker News@lemmy.bestiver.seEnglish · 2 months agoImproved Git Diffs with Delta, Fzf and a Little Shell Scriptingnickjanetakis.comexternal-linkmessage-square1fedilinkarrow-up111arrow-down10file-text
arrow-up111arrow-down1external-linkImproved Git Diffs with Delta, Fzf and a Little Shell Scriptingnickjanetakis.comRSS Bot@lemmy.bestiver.seMB to Hacker News@lemmy.bestiver.seEnglish · 2 months agomessage-square1fedilinkfile-text
minus-squarexia@lemmy.calinkfedilinkEnglisharrow-up1·2 months agoI find it helpful to switch the default diff2 conflict style (which just shows the two chamges) to diff3 (which shows the unchanged lines/common ancestor too).
I find it helpful to switch the default diff2 conflict style (which just shows the two chamges) to diff3 (which shows the unchanged lines/common ancestor too).