Mercurial > hg
comparison .hgtags @ 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 | e0bfa3374a6a |
children | 0afb81bdf374 |
comparison
equal
deleted
inserted
replaced
26317:07ac78ba2e37 | 26318:d3bd6cefd742 |
---|