Mercurial > hg
diff mercurial/util.py @ 8733:f8be48c6b08c
merge: simplify flag merging code slightly
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | a87c41f65aff |
children | c5f36402daad |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | a87c41f65aff |
children | c5f36402daad |