mergetools / gvimdiffon commit Merge branch 'maint' (05ad292)
   1. "$MERGE_TOOLS_DIR/vimdiff"