Skip to content

Navigation Menu

Explore
By company size
By use case
By industry
View all solutions
Topics
- AI
- DevOps
- Security
- Software Development
- View all
Explore
- GitHub Sponsors
  Fund open source developers
- The ReadME Project
  GitHub community articles
Repositories
- Enterprise platform
  AI-powered developer platform
Available add-ons
Pricing

Search code, repositories, users, issues, pull requests...

Search

Clear

Search syntax tips

Provide feedback

We read every piece of feedback, and take your input very seriously.

Include my email address so I can be contacted

Saved searches

Use saved searches to filter your results more quickly

Name

Query

To see all available qualifiers, see our documentation.

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

rhysd / conflict-marker.vim Public

Notifications You must be signed in to change notification settings
Fork 18
Star 498

Code
Issues 5
Pull requests 4
Actions
Projects
Wiki
Security
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Projects
Wiki
Security
Insights

Pull requests: rhysd/conflict-marker.vim

Labels 7 Milestones 0

Labels 7 Milestones 0

New pull request New

4 Open 10 Closed

4 Open 10 Closed

Author

Filter by author

Loading

Label

Filter by label

Loading

Use alt + click/return to exclude labels

or ⇧ + click/return for logical OR

Projects

Filter by project

Loading

Milestones

Filter by milestone

Loading

Reviews

Filter by reviews

No reviews Review required Approved review Changes requested

Assignee

Filter by who’s assigned

Assigned to nobody

Loading

Sort

Sort by

Newest Oldest Most commented Least commented Recently updated Least recently updated Best match

Most reactions

Pull requests list

Should change key mappings of c*

#24 opened Aug 8, 2023 by KSR-Yasuda

Loading…

feat: wrap search for next/prev hunk

#23 opened Jun 2, 2023 by hayderhassan

Loading…

add :ConflictMarkerCommonAncestors

#22 opened Nov 3, 2022 by tomtomjhj

Loading…

Doc updates and change default g:conflict_marker_common_ancestors

#20 opened Feb 17, 2022 by Frederick888

Loading…

ProTip! Find all pull requests that aren't related to any open issues with -linked:issue.

Footer

© 2024 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Docs
Contact

You can’t perform that action at this time.