diff options
| author | Marc Coquand <marc@mccd.space> | 2024-09-05 12:15:30 -0500 |
|---|---|---|
| committer | Marc Coquand <marc@mccd.space> | 2024-09-05 12:15:30 -0500 |
| commit | 3783cab095a9167256afcbfe987d11f35a7003b1 (patch) | |
| tree | 73a65b01330ba28777aef62c39446eba80817536 /gitconfig | |
| parent | 1c1bab4e0f73aadec8def78a5313d22e1fb9462f (diff) | |
| download | bsd-netbsd.tar.gz bsd-netbsd.tar.bz2 bsd-netbsd.zip | |
changesnetbsd
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -14,6 +14,8 @@ helper = !pass 'fastmail/git' [color] ui = false +[merge] + tool = meld [mergetool] layout = LOCAL,MERGED,REMOTE [sendemail] |