Ilya Grigoriev ilyagr
ilyagr
/ .gitconfig
Created
February 10, 2023 05:25
— forked from amiryal/git config
Easily visualise Git merge.conflictstyle diff3 with meld, while preserving all information
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
| [merge] | |
| conflictstyle = diff3 | |
| tool = three_meld | |
| [mergetool "three_meld"] | |
| # Opens up four diff windows: | |
| # LOCAL:MERGED, BASE:LOCAL, BASE:REMOTE, LOCAL:REMOTE | |
| # | |
| # Lets you edit the MERGED file (including original diff3 markers), showing | |
| # you the final diff from LOCAL. For reference, you can look in the other | |
| # windows to see how LOCAL and REMOTE are each different from BASE, as well |