mergetools / gvimdiff3on commit Merge branch 'jk/t0002-simplify' into next (a7a24f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"