diff options
| author | Mirek Kratochvil <exa.exa@gmail.com> | 2025-08-31 13:11:27 +0200 |
|---|---|---|
| committer | Mirek Kratochvil <exa.exa@gmail.com> | 2025-08-31 13:11:27 +0200 |
| commit | ecb03d3be41f56d00cb0f6c32636052f5e2a7626 (patch) | |
| tree | ffbad8a17e302d720b5508f31bafb539dd1c459d /README.md | |
| parent | e6ae4a04d3aae9e2d47ba544f3dcb21f1a6f31f5 (diff) | |
| download | werge-ecb03d3be41f56d00cb0f6c32636052f5e2a7626.tar.gz werge-ecb03d3be41f56d00cb0f6c32636052f5e2a7626.tar.bz2 | |
tiny fix
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -228,8 +228,8 @@ work with `git rebase` that runs in the "merge mode" (which is the default). As a possible source of confusion, the "my" and "your" versions are somewhat swapped (as implied by semantics): -- With `git checkout mybranch; git merge otherbranch`, the conflicts contents - will contain roughly: +- With `git checkout mybranch; git merge otherbranch`, the conflicts will look + roughly like this: ``` <<<<< mybranch version ||||| merge base ===== otherbranch version >>>>> ``` |