Mercurial > hg
diff mercurial/statichttprepo.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 | 931a72e00efa |
children | b4f5f76386f2 |