Skip to content

Releases: akinsho/git-conflict.nvim

v2.0.0

03 Jun 10:47
bfd9fe6
Compare
Choose a tag to compare

2.0.0 (2024-06-03)

⚠ BREAKING CHANGES

  • mapping: swap prev and next mapping for conflicts (#89)

Features

Bug Fixes

  • extmarks missing from final line (#87) (96458b8)
  • mapping: swap prev and next mapping for conflicts (#89) (c57bbf0)
  • off-by-one error in find_position (#86) (4ff00ae)

v1.3.0

22 Jan 11:02
4c8e252
Compare
Choose a tag to compare

1.3.0 (2024-01-22)

Features

  • api: add conflict_count function (#75) (599d380)

v1.2.2

18 Sep 10:19
4e0191c
Compare
Choose a tag to compare

1.2.2 (2023-09-17)

Bug Fixes

  • quickfix: invoke callback once with all items (#70) (a97a355)

v1.2.1

13 Sep 07:51
ffac553
Compare
Choose a tag to compare

1.2.1 (2023-08-31)

Bug Fixes

  • mappings: set mappings if needed when parsing buffer (#66) (b1c1274)
  • quickfix cmd: construct items from visited buffers (#68) (cee519e)

v1.2.0

21 Aug 08:31
f83d81e
Compare
Choose a tag to compare

1.2.0 (2023-08-21)

Features

Bug Fixes

v1.1.2

27 Apr 09:10
8d962d8
Compare
Choose a tag to compare

1.1.2 (2023-04-26)

Bug Fixes

  • highlights should be default (75e9056)

v1.1.1

26 Apr 08:30
97be43e
Compare
Choose a tag to compare

1.1.1 (2023-04-26)

Bug Fixes

  • check buffer is valid before using it (e41555b), closes #50

v1.1.0

18 Apr 11:54
f2ed4dc
Compare
Choose a tag to compare

1.1.0 (2023-04-18)

Features

Bug Fixes

  • color: reset the color after colorscheme was changed (#39) (#40) (cbefa70)
  • ensure valid value is passed when opening QF (2957f74)