mergetools / gvimdiff3on commit Merge branch 'jc/coding-guidelines' (fcae987)
   1. "$MERGE_TOOLS_DIR/vimdiff"