diff tests/test-children.out @ 6273:20aa460a52b6

merge: move symmetricdifferences to ancestor.py
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Mar 2008 10:02:31 -0500
parents be78ab217109
children 7239e06e58e9
line wrap: on
line diff