Merge branch 'tb/precompose-prefix-simplify'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"