mergetools / gvimdiffon commit Merge branch 'nd/add-empty-fix' (4ba46c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"