issues
search
whiteinge
/
diffconflicts
A better Vimdiff Git mergetool
BSD 3-Clause "New" or "Revised" License
396
stars
20
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
Run diffthis before editing files to avoid foldmethod problem
#29
whiteinge
closed
9 months ago
0
Compatibility with folding
#28
giuseppelettieri
closed
9 months ago
4
Using diff-specific configuration in .vimrc
#27
danielcarr
opened
1 year ago
1
Feedback :)
#26
bew
opened
2 years ago
6
Support for zdiff3 conflict style
#25
barlik
closed
2 years ago
3
Help when editing multiple diffs with git mergetool
#24
tjaartvdwalt
closed
4 years ago
2
Small README tweaks to emphasize a few points
#23
whiteinge
closed
4 years ago
0
Added support for Mercurial to the plugin.
#22
haraldkl
closed
5 years ago
7
Support diff3 conflictStyle
#21
alfunx
closed
5 years ago
3
Set filetype for right split (RCONFL)
#20
alfunx
closed
5 years ago
1
Is it possible to use default two-pane view for viewing `$ git diff` output?
#19
Blake-LeBlanc
closed
5 years ago
2
vim-diffconflict workflow
#18
sandangel
closed
5 years ago
2
How to start in "legacy" Two-Pane view, without 3-Way shown?
#17
Blake-LeBlanc
closed
5 years ago
2
diff with history as another startup option
#16
transamericamoon
closed
5 years ago
1
Add command to Open history tab automatically on startup
#15
jmandawg
closed
5 years ago
3
Local and Remote windows swapped??
#14
jmandawg
closed
5 years ago
1
Get rid of initial prompt (Press Enter to continue)
#13
jmandawg
closed
5 years ago
1
Replace getbufinfo() and lambda for ealier versions of Vim
#12
whiteinge
closed
5 years ago
0
DiffConflictsShowHistory broke?
#11
strobelight
closed
5 years ago
3
Also match Windows line endings
#10
whiteinge
closed
6 years ago
0
Standalone usage
#9
whiteinge
closed
6 years ago
0
Excellent viewmode, thank you!
#8
Blake-LeBlanc
closed
6 years ago
1
Put doc/tags into .gitignore
#7
sudo-nice
closed
6 years ago
2
Define commands with <bang>
#6
sudo-nice
closed
6 years ago
1
Error when running DiffConflictsShowHistory
#5
jeremymarc
closed
6 years ago
2
move to the left to account for splitright
#4
tmc
closed
6 years ago
1
:DiffConflictsShowHistory shows two blank buffers
#3
tmc
closed
6 years ago
0
3way
#2
Dmole
closed
5 years ago
1
Just a couple proof reading suggestions for the README
#1
UtahDave
closed
6 years ago
1