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: muleyuck/conflux.nvim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: muleyuck/conflux.nvim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.0
Choose a head ref
  • 13 commits
  • 14 files changed
  • 3 contributors

Commits on Mar 21, 2026

  1. ci: configure git user identity before updating stable tag

    @muleyuck
    muleyuck committed Mar 21, 2026
    Configuration menu
    Copy the full SHA
    14e8788 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2026

  1. docs: expand README with Behaviour Notes and undocumented feature det… 

    …ails
    @muleyuck
    muleyuck committed Mar 22, 2026
    Configuration menu
    Copy the full SHA
    9cf6721 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2026

  1. ci: extract release-please configuration into dedicated config and ma… 

    …nifest files
    @muleyuck
    muleyuck committed Apr 9, 2026
    Configuration menu
    Copy the full SHA
    3b21604 View commit details
    Browse the repository at this point in the history

  2. ci: add Dependabot configuration for GitHub Actions

    @muleyuck
    muleyuck committed Apr 9, 2026
    Configuration menu
    Copy the full SHA
    e60688b View commit details
    Browse the repository at this point in the history

  3. chore(deps): bump JohnnyMorganz/stylua-action in the dependencies group 

    Bumps the dependencies group with 1 update: [JohnnyMorganz/stylua-action](https://github.com/johnnymorganz/stylua-action).


Updates `JohnnyMorganz/stylua-action` from 4.1.0 to 5.0.0
- [Release notes](https://github.com/johnnymorganz/stylua-action/releases)
- [Commits](JohnnyMorganz/stylua-action@479972f...76fd70c)

---
updated-dependencies:
- dependency-name: JohnnyMorganz/stylua-action
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Apr 9, 2026
    Configuration menu
    Copy the full SHA
    4fbeb0f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from muleyuck/dependabot/github_actions/depende… 

    …ncies-55309e2ba2

chore(deps): bump JohnnyMorganz/stylua-action from 4.1.0 to 5.0.0 in the dependencies group
    @muleyuck
    muleyuck authored Apr 9, 2026
    Configuration menu
    Copy the full SHA
    f44b63d View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2026

  1. feat: add project-wide conflict quickfix list via ConfluxQuickfix com… 

    …mand
    @muleyuck
    muleyuck committed Apr 11, 2026
    Configuration menu
    Copy the full SHA
    10b235a View commit details
    Browse the repository at this point in the history

  2. docs: document ConfluxQuickfix command and cq keymap in README and help

    @muleyuck
    muleyuck committed Apr 11, 2026
    Configuration menu
    Copy the full SHA
    71ab4f5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from muleyuck/feature/conflict-list-to-quickfix 

    feat: add project-wide conflict quickfix list (ConfluxQuickfix / cq)
    @muleyuck
    muleyuck authored Apr 11, 2026
    Configuration menu
    Copy the full SHA
    e9de2be View commit details
    Browse the repository at this point in the history

  4. feat: allow individual keymaps to be disabled by setting them to false

    @muleyuck
    muleyuck committed Apr 11, 2026
    Configuration menu
    Copy the full SHA
    9a6b6e1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #6 from muleyuck/feature/keymap-set-to-disable 

    allow individual keymaps to be disabled by setting them to false
    @muleyuck
    muleyuck authored Apr 11, 2026
    Configuration menu
    Copy the full SHA
    053211a View commit details
    Browse the repository at this point in the history

  6. chore(main): release 1.1.0

    @github-actions @muleyuck
    github-actions[bot] authored and muleyuck committed Apr 11, 2026
    Configuration menu
    Copy the full SHA
    e5f9558 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #5 from muleyuck/release-please--branches--main 

    chore(main): release 1.1.0
    @muleyuck
    muleyuck authored Apr 11, 2026
    Configuration menu
    Copy the full SHA
    9cb539a View commit details
    Browse the repository at this point in the history
Loading