Skip to content

let g:mergetool_use_tab = 0 to use current tab instead of creating new #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

let g:mergetool_use_tab = 0 to use current tab instead of creating new #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions autoload/mergetool.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ function! mergetool#start() "{{{

" Open in new tab, do not break existing layout
if !s:run_as_git_mergetool
tab split
if get(g:, "mergetool_use_tab", 1)
tab split
endif
endif

let g:mergetool_in_merge_mode = 1
Expand Down Expand Up @@ -104,7 +106,11 @@ function! mergetool#stop() " {{{
endif

let g:mergetool_in_merge_mode = 0
tabclose
if get(g:, "mergetool_use_tab", 1)
tabclose
else
only
endif
endif
endfunction " }}}

Expand Down
6 changes: 6 additions & 0 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ Alternatively, you can start with `local` or `unmodified` revision, and change y

### Layout

`vim-mergetool` defaults to create new tab for merging, if you don't want new tab to be created, set

```vim
let g:mergetool_use_tab = 0
```

`vim-mergetool` defaults to two vertical splits layout with `MERGED` file on the left, and `remote` revision on the right. `MERGED` file is processed according to `g:mergetool_prefer_revision` setting as described above.

```vim
Expand Down