Search results

<code>set nomodifiable</code> precludes use of <code>:diffput</code>

Status: Open.

#27 In samoshkin/vim-mergetool;

· ahansen90 opened on Jun 1, 2023

Confusion about remote vs local

Status: Open.

#26 In samoshkin/vim-mergetool;

· aimran-adroll opened on Jul 28, 2022

Keep both

Status: Open.

#25 In samoshkin/vim-mergetool;

· ahoereth opened on Jun 22, 2022

REMOTE and LOCAL buffers fail to load

Status: Open.

#24 In samoshkin/vim-mergetool;

· idbrii opened on Feb 28, 2022

How to use BASE as the MERGED file?

Status: Open.

#21 In samoshkin/vim-mergetool;

· RTS5227 opened on Sep 7, 2020

Add :help documentaion

Status: Open.

#20 In samoshkin/vim-mergetool;

· davewilmo opened on Aug 14, 2020

Support mergetool of any scm by loading necessary files at startup

Status: Open.

#13 In samoshkin/vim-mergetool;

· idbrii opened on Apr 16, 2020

Does not seem to work on MacOS

Status: Open.

#12 In samoshkin/vim-mergetool;

· flavius opened on Feb 9, 2020

It's not possible to merge conflicts in the same branch.

Status: Open.

#11 In samoshkin/vim-mergetool;

· MoezGholami opened on Oct 13, 2019

Could be please provide a variable that stops using new tab?

Status: Open.

#6 In samoshkin/vim-mergetool;

· c02y opened on Aug 8, 2019