comparison tests/test-conflict.t @ 28979:e442b628bfe6 stable

Added signature for changeset 740156eedf2c
author Matt Mackall <mpm@selenic.com>
date Sat, 16 Apr 2016 18:09:42 -0500
parents c3e9269d9602
children 940c05b25b07
comparison
equal deleted inserted replaced
28978:1f277ae29168 28979:e442b628bfe6