-
mpm authored
For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.
eea96285cbf9
This instance will be upgraded to Heptapod 1.5.0rc2 (GitLab 16.11.1) on 2024-05-10 at 18:00 UTC+2
For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.