mergetools / gvimdiffon commit Merge branch 'jc/remove-export-from-config-mak-in' (b2fb391)
   1. "$MERGE_TOOLS_DIR/vimdiff"