Mercurial > hg
diff mercurial/ignore.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 | 58c497d0e44d |
children | ee112eb69d2a |