samoshkin vim-mergetool issues

samoshkin / vim-mergetool

:cake: Efficient way of using Vim as a Git mergetool

MIT License

287 stars 15 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

`set nomodifiable` precludes use of `:diffput`

#27 ahansen90 opened 1 year ago
0
Confusion about remote vs local

#26 aimran-adroll opened 2 years ago
1
Keep both

#25 ahoereth opened 2 years ago
0
REMOTE and LOCAL buffers fail to load

#24 idbrii opened 2 years ago
2
Tried adding the keymapping but it doesnt work

#23 laleeroy closed 2 years ago
0
Allow to use BASE as MERGED file

#22 RTS5227 opened 4 years ago
0
How to use BASE as the MERGED file?

#21 RTS5227 opened 4 years ago
0
Add :help documentaion

#20 davewilmo opened 4 years ago
0
Create vimdoc from readme

#19 idbrii opened 4 years ago
0
Using g:MergetoolSetLayoutCallback for equal sized windows doesn't work on initial MergetoolStart

#18 idbrii closed 4 years ago
1
Support any scm by assigning args at startup

#17 idbrii opened 4 years ago
0
Support using as git-mergetool on win32

#16 idbrii opened 4 years ago
0
Make merged file hidden while changing layout

#15 idbrii opened 4 years ago
0
Simplify interface: hide irrelevant commands when not merging

#14 idbrii opened 4 years ago
0
Support mergetool of any scm by loading necessary files at startup

#13 idbrii opened 4 years ago
0
Does not seem to work on MacOS

#12 flavius opened 4 years ago
1
It's not possible to merge conflicts in the same branch.

#11 MoezGholami opened 5 years ago
1
Solve #9

#10 MoezGholami opened 5 years ago
1
MergetoolDiffExchange has undesired behavior

#9 MoezGholami opened 5 years ago
1
Create doc for in-Vim help

#8 pappasam closed 5 years ago
0
`let g:mergetool_use_tab = 0` to use current tab instead of creating new

#7 c02y opened 5 years ago
1
Could be please provide a variable that stops using new tab?

#6 c02y opened 5 years ago
0
fix: "File does not have correct conflict markers" if &wrapscan

#5 ilAYAli closed 5 years ago
1
`git mergetool` [error]

#4 nicanordlc closed 5 years ago
1
docs: improve spelling and grammar

#3 sQVe closed 5 years ago
2
better error message if user doesnt configure diff3

#2 dougpagani closed 5 years ago
1
Improve Windows compatibility

#1 jonasw234 closed 5 years ago
2