mergetools / gvimdiff3on commit Merge branch 'bw/rebase-autostash-keep-current-branch' (974bdb0)
   1. "$MERGE_TOOLS_DIR/vimdiff"