Skip to content

Commit 124fb25

Browse files
committed
Remove screenshot on 3-way diff between LOCAL and REMOTE from readme
1 parent 7fc3f91 commit 124fb25

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

readme.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,8 @@ To show usual `REMOTE`, `LOCAL`, `BASE` history revisions, use uppercase charact
154154
let g:mergetool_layout = 'LmR'
155155
```
156156

157-
Here you can spot the difference comparing against LOCAL/REMOTE branch tips versus picking up `ours` or `theirs` revision based on conflict markers in a `MERGED` file. You're getting diff highlighting even when there is no merge conflicts.
158-
159157
By the way, this setup is pretty much same to what [vim-fugitive](https://github.com/tpope/vim-fugitive) `:Gdiff` does, except that conflict markers are already removed. You can use `g:mergetool_prefer_revision='unmodified'` to replicate vim-fugitive completely. Indeed, `vim-mergetool` is flexible enough to replicate any existing vim+merge solution.
160158

161-
![3 way diff between LOCAL and REMOTE](./screenshots/LmR_3splits_layout.png)
162-
163159
By default vertical splits are used. If you prefer working with horizontal splits:
164160

165161
```vim

screenshots/LmR_3splits_layout.png

-1.26 MB
Binary file not shown.

0 commit comments

Comments
 (0)