comparison .hgignore @ 792:49ec802b4a16

Added tests for bug with three-way-merging of old tip, tip and cwd.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jul 2005 17:14:05 +0100
parents d2422f10c136
children cdf61d3d3904 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
791:040655ea0cc4 792:49ec802b4a16