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: akinsho/git-conflict.nvim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.2
Choose a base ref
...
head repository: akinsho/git-conflict.nvim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.3.0
Choose a head ref
  • 6 commits
  • 4 files changed
  • 4 contributors

Commits on Sep 18, 2023

  1. chore(build): auto-generate vimdoc

    @github-actions
    github-actions[bot] committed Sep 18, 2023
    Configuration menu
    Copy the full SHA
    8962619 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. feat(api): add conflict_count function (#75)

    @daanvdk
    daanvdk authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    599d380 View commit details
    Browse the repository at this point in the history

  2. chore(build): auto-generate vimdoc

    @github-actions
    github-actions[bot] committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    690879b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. chore(README): fix code snippet for auto commands (#77)

    @zedutch
    zedutch authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    834d22e View commit details
    Browse the repository at this point in the history

  2. chore(build): auto-generate vimdoc

    @github-actions
    github-actions[bot] committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    978b999 View commit details
    Browse the repository at this point in the history

  3. chore(main): release 1.3.0 (#76) 

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    @github-actions
    github-actions[bot] authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    4c8e252 View commit details
    Browse the repository at this point in the history
Loading