mergetools / gvimdiffon commit Merge branch 'jc/config-pathname-type' (fd87e70)
   1. "$MERGE_TOOLS_DIR/vimdiff"