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