Mercurial > hg
diff contrib/win32/mercurial.ini @ 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 | 5f01fd602542 |
children | a4049424cb51 |