mergetools / gvimdiff3on commit Merge branch 'wd/rebase-conflict-guide' (076eeec)
   1. "$MERGE_TOOLS_DIR/vimdiff"