Mercurial > hg
diff mercurial/ancestor.py @ 11780:3cdd6fdc3d9e
Merge with stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Wed, 11 Aug 2010 12:30:18 +0200 |
parents | 67bb9d78f05e |
children | 4f8067c94729 |
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Wed, 11 Aug 2010 12:30:18 +0200 |
parents | 67bb9d78f05e |
children | 4f8067c94729 |