diff tests/test-convert-cvs-detectmerge.t @ 20279:5b4f963d21cc

merge: refactor initialization of variables in update There is no code change here but this helps prepare for future commits that will fix a bare update with obsolete markers.
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 06 Nov 2013 17:02:07 -0600
parents aa9385f983fa
children 7a9cbb315d84
line wrap: on
line diff