comparison tests/test-merge.py @ 161:ec935041d1ff

Added tag 1.6 for changeset 91329df47df5
author Matt Mackall <mpm@selenic.com>
date Wed, 01 Apr 2015 13:34:58 -0500
parents c1b966866ed7
children 8c4d24b58c23
comparison
equal deleted inserted replaced
160:91329df47df5 161:ec935041d1ff