diff options
| author | Matt Hunter <m@lfurio.us> | 2026-06-03 04:24:11 -0400 |
|---|---|---|
| committer | Matt Hunter <m@lfurio.us> | 2026-06-03 04:24:11 -0400 |
| commit | c006aea65562af6944ed5237e6378ad08d274cf2 (patch) | |
| tree | 0bce593a87e623d585e0f570db185e56d04915ce | |
| parent | 044bb5701cc0150bd26c1f8a1013158ae0c9af60 (diff) | |
| download | rice-c006aea65562af6944ed5237e6378ad08d274cf2.tar.gz rice-c006aea65562af6944ed5237e6378ad08d274cf2.zip | |
git: Don't create .orig files when running mergetool
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -32,6 +32,8 @@ [merge] log = true tool = vimdiff +[mergetool] + keepBackup = false [push] autoSetupRemote = true default = current |