mergetools / gvimdiff3on commit Merge branch 'mt/patch-id-stable' (early part) (79e5394)
   1. "$MERGE_TOOLS_DIR/vimdiff"