mergetools / gvimdiff3on commit Merge branch 'pw/completion-stash' (8716bdc)
   1. "$MERGE_TOOLS_DIR/vimdiff"