Merge branch 'sg/bash-prompt-dirty-orphan'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"