mergetools / gvimdiff2on commit Merge branch 'bm/repository-layout-typofix' (fa9e793)
   1. "$MERGE_TOOLS_DIR/vimdiff"