# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1554905519 -7200
# Node ID 099e0ca8285ef5318ba2f5226a5fe25a6331c01c
# Parent  e3785a8d0712c677d6a65bad1cb260813eb6c36b
changelog: mention issue6089 fix

diff -r e3785a8d0712 -r 099e0ca8285e CHANGELOG
--- a/CHANGELOG	Sat Feb 23 15:17:55 2019 +0100
+++ b/CHANGELOG	Wed Apr 10 16:11:59 2019 +0200
@@ -12,6 +12,7 @@
             enables it. Double check your server configuration (issue6057)
   * evolve: make sure divergence resolution don't replace the initial author
             (issue6113)
+  * pick: align working dir branch with the one from the pick result (issue6089)
 
 8.4.0 -- 2019-12-22
 -------------------
diff -r e3785a8d0712 -r 099e0ca8285e tests/test-issue-6089.t