comparison hgmerge @ 1698:ad4a2eefe4d7

Update copyright notice
author Matt Mackall <mpm@selenic.com>
date Sun, 05 Feb 2006 22:21:02 -0600
parents 4338e33c973b
children 83e8cd97b9f9
comparison
equal deleted inserted replaced
1697:7b4128f689bd 1698:ad4a2eefe4d7