Mercurial > hg
comparison .hgsigs @ 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 | d0843f7e16b4 |
children | 93bfa9fc96e3 |
comparison
equal
deleted
inserted
replaced
26317:07ac78ba2e37 | 26318:d3bd6cefd742 |
---|