minus-squareScrollone@feddit.ittoProgrammer Humor@lemmy.ml•diff tools cannot handle moving code blockslinkfedilinkarrow-up3·1 year agoI think Sublime Merge does this with the conflict resolution tool linkfedilink
minus-squareScrollone@feddit.ittoProgrammer Humor@lemmy.ml•The Printer That Simply Workedlinkfedilinkarrow-up3·1 year agoThe author of the book never had a Brother, it seems linkfedilink
minus-squareScrollone@feddit.ittoProgrammer Humor@lemmy.ml•Ah the disaster recovery planlinkfedilinkarrow-up8·1 year agoAnd the book is empty inside linkfedilink
I think Sublime Merge does this with the conflict resolution tool