Mercurial > hg
diff tests/test-simplemerge.py.out @ 12894:bc91a79fa3d0 stable
demandimport: back out 50a4e55aa278 (issue2467)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 30 Oct 2010 11:32:04 -0500 |
parents | 2e3c54fb79a3 |
children | f18830651811 |