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

tiny fix

Browse source
This commit is contained in:
Mirek Kratochvil 2025-08-31 13:11:27 +02:00
parent e6ae4a04d3
commit ecb03d3be4
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

@ -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): 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 - With `git checkout mybranch; git merge otherbranch`, the conflicts will look
will contain roughly: roughly like this:
``` ```
<<<<< mybranch version ||||| merge base ===== otherbranch version >>>>> <<<<< mybranch version ||||| merge base ===== otherbranch version >>>>>
``` ```