5 ms·
This is what I use in my ~/.gitconfig: [difftool "meld"] cmd = meld "$LOCAL" "$REMOTE" [mergetool "meld"] cmd = meld --auto-merge --output
by niedzielski 4y ago
This is what I use in my ~/.gitconfig:
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[mergetool "meld"]
cmd = meld --auto-merge --output "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
- manx 4y agoAs far as I understand, this only resolves conflicts, git can already resolve with it's line-based approach. I'm talking about conflicts within a single line, that a line based approach cannot solve.
- niedzielski 4y agoThanks! I wasn't understanding that before.