mergetools / gvimdiff3on commit Merge branch 'mm/log-branch-desc-plug-leak' (1bada2b)
   1. "$MERGE_TOOLS_DIR/vimdiff"