Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mistweaverco/diffconflicts.nvim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: mistweaverco/diffconflicts.nvim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.0
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Aug 24, 2025

  1. feat(docs): add screenshot + testscript

    @gorillamoe
    gorillamoe committed Aug 24, 2025
    Configuration menu
    Copy the full SHA
    f2e866b View commit details
    Browse the repository at this point in the history

  2. feat(docs): add lua api

    @gorillamoe
    gorillamoe committed Aug 24, 2025
    Configuration menu
    Copy the full SHA
    be830dc View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2026

  1. feat(dx): add .luarc.json file

    @gorillamoe
    gorillamoe committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    2acb67f View commit details
    Browse the repository at this point in the history

  2. feat(vcs): add jujutsu support

    @gorillamoe
    gorillamoe committed Mar 25, 2026
    Configuration menu
    Copy the full SHA
    e5393fc View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2026

  1. feat(dx): add qol improvements to diffconflicts (#2) 

    - Auto advance on conflict resolution
- Auto close diffconflicts when all conflicts are resolved

fix jj conflict detection
    @gorillamoe
    gorillamoe authored Apr 8, 2026
    Configuration menu
    Copy the full SHA
    2267daa View commit details
    Browse the repository at this point in the history
Loading