Mercurial > hg
diff mercurial/simplemerge.py @ 6772:84b53eef9964
context: simplify parents code
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 11 Jul 2008 18:46:02 -0500 |
parents | e75aab656f46 |
children | 810ca383da9c |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 11 Jul 2008 18:46:02 -0500 |
parents | e75aab656f46 |
children | 810ca383da9c |