mergetools / gvimdiffon commit Merge branch 'nd/no-extern' (0194c9a)
   1. "$MERGE_TOOLS_DIR/vimdiff"