diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-09-05 22:00:29 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-09-05 22:00:29 +0200 |
| commit | 6cdd70feafe7b8047c38ac1e4f5d6fa9ffe97f28 (patch) | |
| tree | bab7b6c3d99f22cfa479509837d8d76016a1b968 | |
| parent | 50a3d08aa82a07894147b77278de57e8db15f736 (diff) | |
| download | werge-6cdd70feafe7b8047c38ac1e4f5d6fa9ffe97f28.tar.gz werge-6cdd70feafe7b8047c38ac1e4f5d6fa9ffe97f28.tar.bz2 | |
wording
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -207,8 +207,8 @@ and `git mergetool -t werge`: ``` 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 -result. In turn, the auto-merging with `git mergetool -t werge` fails with +and thus `git` expects them to always produce a completely merged, conflictless +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 from the backup. To enable a more useful behavior, use `werge` as a merge driver (see below). |