Mercurial > hg
comparison mercurial/transaction.py @ 13536:fac040b7e822
merge: drop resolve state for mergers with identical contents (issue2680)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 05 Mar 2011 16:34:59 -0600 |
parents | 19ad316e5be3 |
children | f366d4c2ff34 |
comparison
equal
deleted
inserted
replaced
13535:0d3cce1de233 | 13536:fac040b7e822 |
---|