RSS BotMB to Hacker NewsEnglish · 25 days agoImproved Git Diffs with Delta, Fzf and a Little Shell Scriptingnickjanetakis.comexternal-linkmessage-square1linkfedilinkarrow-up111arrow-down10file-text
arrow-up111arrow-down1external-linkImproved Git Diffs with Delta, Fzf and a Little Shell Scriptingnickjanetakis.comRSS BotMB to Hacker NewsEnglish · 25 days agomessage-square1linkfedilinkfile-text
minus-squarexia@lemmy.calinkfedilinkEnglisharrow-up1·15 days 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).