mergetools / gvimdiffon commit Merge branch 'nd/test-rename-reset' (f813f71)
   1. "$MERGE_TOOLS_DIR/vimdiff"