|
|
|
|
|
|
by loloquwowndueo
1552 days ago
|
|
|
Since everyone else is mentioning other tools, here’s my mention for vimdiff. I think I have meld installed but rarely use it because vimdiff is usually enough. As a bonus I get to use my usual editing keys when working with it. |
|
|
it may not be the best merge tool in existence but it's adequate (which is actually, suprisingly good, given it is not at all its intended function) and at that point having all my standard vim configuration, editing capabilities etc. beats anything another tool would bring to the table.
Not to mention, 100% terminal UI and built-into-vim means I can use it everywhere and anywhere without thinking about it.