Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"