update changes

ocaml · Sep 2, 2022 · 5cf7c4b · 5cf7c4b
1 parent 3f0f4de
commit 5cf7c4b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -324,6 +324,7 @@ users)
   * Add a series of reftests showing empty conflict messages [#5253 @kit-ty-kate]
   * Fix the reftests under some heavy parallel hardwear [#5262 @kit-ty-kate]
   * Add some tests for --best-effort to avoid further regressions when trying to install specific versions of packages [@5261 @kit-ty-kate]
+  * Add unhelpful conflict error message test [#5270 @kit-ty-kate]
 ### Engine
   * Add `opam-cat` to normalise opam file printing [#4763 @rjbou @dra27] [2.1.0~rc2 #4715]
   * Fix meld reftest: open only with failing ones [#4913 @rjbou]