Mercurial > public > mercurial-scm > hg-stable
diff tests/test-simplemerge.py @ 12549:7b51cce70a37
merge stable into default
author | Martin Roppelt <m.p.roppelt@web.de> |
---|---|
date | Wed, 22 Sep 2010 09:22:42 +0200 |
parents | e433002acb05 |
children | 7de7630053cb |