Ecosyste.ms: Issues

An open API service for providing issue and pull request metadata for open source projects.

GitHub / whiteinge/diffconflicts issues and pull requests

#29 - Run diffthis before editing files to avoid foldmethod problem

Pull Request - State: closed - Opened by whiteinge 12 months ago

#28 - Compatibility with folding

Issue - State: closed - Opened by giuseppelettieri 12 months ago - 4 comments

#27 - Using diff-specific configuration in .vimrc

Issue - State: open - Opened by danielcarr about 2 years ago - 1 comment

#26 - Feedback :)

Issue - State: open - Opened by bew over 2 years ago - 6 comments

#25 - Support for zdiff3 conflict style

Pull Request - State: closed - Opened by barlik over 2 years ago - 3 comments

#24 - Help when editing multiple diffs with git mergetool

Issue - State: closed - Opened by tjaartvdwalt over 4 years ago - 2 comments

#23 - Small README tweaks to emphasize a few points

Pull Request - State: closed - Opened by whiteinge about 5 years ago

#22 - Added support for Mercurial to the plugin.

Pull Request - State: closed - Opened by haraldkl over 5 years ago - 7 comments

#21 - Support diff3 conflictStyle

Pull Request - State: closed - Opened by alfunx over 5 years ago - 3 comments

#20 - Set filetype for right split (RCONFL)

Pull Request - State: closed - Opened by alfunx over 5 years ago - 1 comment

#19 - Is it possible to use default two-pane view for viewing `$ git diff` output?

Issue - State: closed - Opened by Blake-LeBlanc almost 6 years ago - 2 comments
Labels: enhancement, question

#18 - vim-diffconflict workflow

Issue - State: closed - Opened by sandangel about 6 years ago - 2 comments
Labels: question

#17 - How to start in "legacy" Two-Pane view, without 3-Way shown?

Issue - State: closed - Opened by Blake-LeBlanc about 6 years ago - 2 comments
Labels: question

#16 - diff with history as another startup option

Pull Request - State: closed - Opened by transamericamoon about 6 years ago - 1 comment

#15 - Add command to Open history tab automatically on startup

Issue - State: closed - Opened by jmandawg about 6 years ago - 3 comments

#14 - Local and Remote windows swapped??

Issue - State: closed - Opened by jmandawg about 6 years ago - 1 comment

#13 - Get rid of initial prompt (Press Enter to continue)

Issue - State: closed - Opened by jmandawg about 6 years ago - 1 comment

#12 - Replace getbufinfo() and lambda for ealier versions of Vim

Pull Request - State: closed - Opened by whiteinge about 6 years ago

#11 - DiffConflictsShowHistory broke?

Issue - State: closed - Opened by strobelight about 6 years ago - 3 comments
Labels: bug

#10 - Also match Windows line endings

Pull Request - State: closed - Opened by whiteinge about 6 years ago

#9 - Standalone usage

Pull Request - State: closed - Opened by whiteinge about 6 years ago

#8 - Excellent viewmode, thank you!

Issue - State: closed - Opened by Blake-LeBlanc about 6 years ago - 1 comment
Labels: awesome

#7 - Put doc/tags into .gitignore

Pull Request - State: closed - Opened by sudo-nice over 6 years ago - 2 comments

#6 - Define commands with <bang>

Pull Request - State: closed - Opened by sudo-nice over 6 years ago - 1 comment

#5 - Error when running DiffConflictsShowHistory

Issue - State: closed - Opened by jeremymarc over 6 years ago - 2 comments
Labels: question

#4 - move to the left to account for splitright

Pull Request - State: closed - Opened by tmc over 6 years ago - 1 comment

#3 - :DiffConflictsShowHistory shows two blank buffers

Issue - State: closed - Opened by tmc over 6 years ago

#2 - 3way

Issue - State: closed - Opened by Dmole over 6 years ago - 1 comment
Labels: enhancement, help wanted, good first issue

#1 - Just a couple proof reading suggestions for the README

Pull Request - State: closed - Opened by UtahDave over 6 years ago - 1 comment