mergetools / gvimdiff2on commit Merge branch 'rr/rebase-stash-store' (fa4bf9e)
   1. "$MERGE_TOOLS_DIR/vimdiff"