Mercurial > hg
diff mercurial/help/extensions.txt @ 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 | ebfc46929f3e |
children | da16d21cf4ed |