comparison tests/test-rename-merge1.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 5af5f0f9d724
children 4b0c9c674707
comparison
equal deleted inserted replaced
6272:dd9bd227ae9a 6273:20aa460a52b6