commit - 98f303bdb24bd31ec25a543f7ab7af1d6704fa8f
commit + daf70786f929e3fd4995ad5d56bd93b437c20e5e
blob - 054be7e3c9fa3de5813c11211ac88df99fd2d3ce
blob + 344694af559193ee1470454d5a1d9e76408434ff
--- NEWS
+++ NEWS
-0.21.6 UNRELEASED
+0.21.6 2023-09-02
* index: Handle different stages of conflicted paths.
(Kevin Hendricks, Jelmer Vernooij)
blob - 933e9f9773e248a925b910fdc1906eaf7946098e
blob + 292469edf6de0a9fbb9a6aa7c371ad5eecbe8764
--- dulwich/__init__.py
+++ dulwich/__init__.py
"""Python implementation of the Git file formats and protocols."""
-__version__ = (0, 21, 5)
+__version__ = (0, 21, 6)