mergetools / vimdiff2on commit Merge branch 'jc/remove-treesame-parent-in-simplify-merges' (436b60c)
   1. "$MERGE_TOOLS_DIR/vimdiff"