mergetools / gvimdiffon commit Merge branch 'nd/diff-i-t-a' (d0c6922)
   1. "$MERGE_TOOLS_DIR/vimdiff"