mergetools / vimdiff3on commit Merge branch 'wk/t1304-wo-USER' (bb8caad)
   1. "$MERGE_TOOLS_DIR/vimdiff"