mergetools / gvimdiff2on commit Merge branch 'nd/apply-report-skip' (11cfcc5)
   1. "$MERGE_TOOLS_DIR/vimdiff"