Mercurial > hg
diff mercurial/archival.py @ 13549:6217040b2780 stable
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 | 14f3795a5ed7 |
children | 9a41af6b9f29 |