Merge branch 'km/branch-get-push-while-detached'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"