comparison tests/test-merge.py @ 121:cc905ee18449

Added tag 1.2 for changeset 5d3783aebe5f
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Feb 2014 15:30:18 -0600
parents ebcc5d7dd528
children 4359cabcb0cc
comparison
equal deleted inserted replaced
120:5d3783aebe5f 121:cc905ee18449