vpetruchok
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # 3-way merge style | |
| git config merge.conflictstyle diff3 | |
| # 2-way merge style (by default) | |
| git config merge.conflictstyle merge |
NewerOlder