Wed, 19 Aug 2015 14:05:42 -0500 bidmerge: choose shortest list of diverge and rename/delete warnings
Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 14:05:42 -0500] rev 26318
bidmerge: choose shortest list of diverge and rename/delete warnings Slightly less arbitrary than choosing the first set.
Wed, 19 Aug 2015 14:04:54 -0500 copies: rename diverge2 to divergeset for clarity
Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 14:04:54 -0500] rev 26317
copies: rename diverge2 to divergeset for clarity
Wed, 19 Aug 2015 13:40:18 -0500 copies: begin separating mergecopies sides
Matt Mackall <mpm@selenic.com> [Wed, 19 Aug 2015 13:40:18 -0500] rev 26316
copies: begin separating mergecopies sides
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip