diff hgmerge @ 4293:b0140ead7f70

test-filebranch: avoid a shell script
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 27 Mar 2007 01:41:16 -0300
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff