# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1630691203 -19800
# Node ID f138aea6e26b673dfc9d9cfa3aa9609b833d3ab5
# Parent  01bc197f31d3efa09820a81a59c2f3570223912d
tests: update test cases resolution documentation to current status

diff -r 01bc197f31d3 -r f138aea6e26b tests/test-evolve-wdir.t
--- a/tests/test-evolve-wdir.t	Fri Sep 03 23:13:13 2021 +0530
+++ b/tests/test-evolve-wdir.t	Fri Sep 03 23:16:43 2021 +0530
@@ -17,10 +17,12 @@
 ..     Resolution : update to a not-dead ancestor
 ..
 .. Case C: obsolete wdp with multiple successor (divergence rewriting)
-..     Resolution : #TODO: not handled yet
+..     Resolution : suggest to check out one of the divergent cset and
+..                  run `hg evolve --content-divergent`
 ..
 .. Case D: obsolete wdp with multiple successor (split rewriting)
-..     Resolution : #TODO: not handled yet
+..     Resolution : if split over a single topological branch, update to
+..                  tipmost, otherwise ask user to choose one
 
 A. Obsolete wdp with single successor
 -------------------------------------