mergetools / gvimdiff2on commit Merge branch 'ac/complete-pull-autostash' (00bcc35)
   1. "$MERGE_TOOLS_DIR/vimdiff"