comparison tests/test-simplemerge.py.out @ 18743:70e2a22fd66e

merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Fri, 01 Mar 2013 10:05:37 -0600
parents 2e3c54fb79a3
children f18830651811
comparison
equal deleted inserted replaced
18742:a07be8953733 18743:70e2a22fd66e