# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1600762421 -19800
# Node ID 43166f87407b50c5b1cbc83c6f85e4f4546adcdc
# Parent  7f8055eb07c719e7ee27f37d50492bcab8be220d
evolve: update docstring for mergeusers()

diff -r 7f8055eb07c7 -r 43166f87407b hgext3rd/evolve/utility.py
--- a/hgext3rd/evolve/utility.py	Fri Oct 02 10:09:14 2020 -0700
+++ b/hgext3rd/evolve/utility.py	Tue Sep 22 13:43:41 2020 +0530
@@ -209,8 +209,11 @@
     return revs[intidx - 1]
 
 def mergeusers(ui, base, divergent, other):
-    """ merges the users from two divergent changesets using three-way merge
-    and return the user that will be used as the author of resolved cset"""
+    """Return the merged user from two divergent changesets.
+
+    Perform merge using 3-way merge. If unable to merge, concatenate
+    the two users.
+    """
     baseuser = base.user()
     divuser = divergent.user()
     othuser = other.user()