4 ms·The merge conflict resolver is really so fantastic, miles better than other visual merge tools I've used.by corytheboyd 4y agoThe merge conflict resolver is really so fantastic, miles better than other visual merge tools I've used.