mergetools / gvimdiff3on commit Merge branch 'jc/fetch-pull-refmap' (a668853)
   1. "$MERGE_TOOLS_DIR/vimdiff"