mergetools / vimdiff2on commit Merge branch 'jc/add-ignore-removal' (838f9c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"