Git supports using vim diff to resolve merge conflicts git mergetool -t vimdiff To make it the default merge tool across all your repos git config --global merge.tool vimdiff
| Attributes | Values |
|---|---|
| rdfs:label |
|
| rdfs:comment |
|
| Version |
|
| dbkwik:vim/property/wikiPageUsesTemplate | |
| Previous |
|
| Category |
|
| Text |
|
| Author |
|
| Subpage |
|
| Complexity |
|
| Created |
|
| ID |
|
| NEXT |
|
| abstract |
|