# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-08-19 19:04:54
# Node ID 07ac78ba2e379baefc83148096f2ddf34bb2b7c8
# Parent  d5618e210191d242d4ddb1d19ff36098cdca528f

copies: rename diverge2 to divergeset for clarity

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -341,7 +341,7 @@ def mergecopies(repo, c1, c2, ca):
 
     renamedelete = {}
     renamedelete2 = set()
-    diverge2 = set()
+    divergeset = set()
     for of, fl in diverge.items():
         if len(fl) == 1 or of in c1 or of in c2:
             del diverge[of] # not actually divergent, or not a rename
@@ -351,7 +351,7 @@ def mergecopies(repo, c1, c2, ca):
                 renamedelete[of] = [f for f in fl if f in c1 or f in c2]
                 renamedelete2.update(fl) # reverse map for below
         else:
-            diverge2.update(fl) # reverse map for below
+            divergeset.update(fl) # reverse map for below
 
     bothnew = sorted(addedinm1 & addedinm2)
     if bothnew:
@@ -376,13 +376,13 @@ def mergecopies(repo, c1, c2, ca):
             note = ""
             if f in copy:
                 note += "*"
-            if f in diverge2:
+            if f in divergeset:
                 note += "!"
             if f in renamedelete2:
                 note += "%"
             repo.ui.debug("   src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f,
                                                               note))
-    del diverge2
+    del divergeset
 
     if not fullcopy:
         return copy, movewithdir, diverge, renamedelete