Merge branch 'po/remote-set-head-usage'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"