mergetools / gvimdiff3on commit Merge branch 'jc/grep-commandline-vs-configuration' (b422d99)
   1. "$MERGE_TOOLS_DIR/vimdiff"