mergetools / gvimdiffon commit Merge branch 'nd/indent-fix-connect-c' (34a2e88)
   1. "$MERGE_TOOLS_DIR/vimdiff"