comparison tests/test-merge4.t @ 18533:19df8a5b7618 stable

Added tag 2.5 for changeset a6088c05e43a
author Matt Mackall <mpm@selenic.com>
date Fri, 01 Feb 2013 15:31:57 -0600
parents 63c817ea4a70
children 8561ad49915d
comparison
equal deleted inserted replaced
18532:a6088c05e43a 18533:19df8a5b7618