• xia@lemmy.ca
    link
    fedilink
    English
    arrow-up
    1
    ·
    14 days ago

    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).