mergetools / gvimdiff3on commit Merge branch 'sv/submitting-final-patch' (ca0107e)
   1. "$MERGE_TOOLS_DIR/vimdiff"