exa/werge
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wording

Browse source
This commit is contained in:
Mirek Kratochvil 2025-09-05 22:00:29 +02:00
parent 50a3d08aa8
commit 6cdd70feaf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -207,8 +207,8 @@ and `git mergetool -t werge`:
``` ```
One issue with `git` mergetools is that they are supposed to be interactive, One issue with `git` mergetools is that they are supposed to be interactive,
and thus `git` assumes them to always produce a completely merged, conflictless and thus `git` expects them to always produce a completely merged, conflictless
result. In turn, the auto-merging with `git mergetool -t werge` fails with result. In turn, if the auto-merging with `git mergetool -t werge` fails with
conflicts, `git` assumes a complete failure and restores the original version conflicts, `git` assumes a complete failure and restores the original version
from the backup. To enable a more useful behavior, use `werge` as a merge from the backup. To enable a more useful behavior, use `werge` as a merge
driver (see below). driver (see below).