comparison tests/test-conflict @ 3828:28134d82db9b

Add notes about diff/merge asymmetry to export, diff, and log
author Matt Mackall <mpm@selenic.com>
date Fri, 08 Dec 2006 13:04:10 -0600
parents e506c14382fd
children 46280c004f22
comparison
equal deleted inserted replaced
3825:158fce02dc40 3828:28134d82db9b