view tests/test-issue1089.out @ 12317:ed639917c825 stable

test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
author Steve Borho <steve@borho.org>
date Fri, 17 Sep 2010 12:44:35 -0500
parents 2268edff1bec
children
line wrap: on
line source

adding a/b
removing a/b
adding a/b
removing a/b