Skip to content

Commit 2bb48c6

Browse files
committed
Updated example git config so keepbackup is respected
1 parent b3792e3 commit 2bb48c6

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.vscodeignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**/*.ts
2+
**/tsconfig.json

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ For example, this sets up Beyond Compare 4 on Windows:
2323
cmd = \"C:\\Program Files\\Beyond Compare 4\\bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
2424
[merge]
2525
tool = beyondcompare4
26+
[mergetool]
27+
keepbackup = false
2628
[mergetool "beyondcompare4"]
2729
cmd = \"C:\\Program Files\\Beyond Compare 4\\bcomp.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
2830
trustexitcode = true
29-
keepbackup = false
3031
```
3132

3233
`keepbackup = false` prevents the system from creating `.orig` backup files after a merge. `trustexitcode = true` tells Git that the diff tool's exit code can be trusted to determine the outcome of the merge.

0 commit comments

Comments
 (0)