mergetools / gvimdiffon commit Merge branch 'nd/commit-doc' (7a15479)
   1. "$MERGE_TOOLS_DIR/vimdiff"