mergetools / gvimdiffon commit Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro' (610a14f)
   1. "$MERGE_TOOLS_DIR/vimdiff"