Mercurial > hg
diff hgweb.cgi @ 26318:d3bd6cefd742
bidmerge: choose shortest list of diverge and rename/delete warnings
Slightly less arbitrary than choosing the first set.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 19 Aug 2015 14:05:42 -0500 |
parents | 85cba926cb59 |
children | 4b0fc75f9403 |