mergetools / gvimdiff3on commit Merge branch 'tb/unicode-7.0-display-width' (5b9b715)
   1. "$MERGE_TOOLS_DIR/vimdiff"