diff hgmerge @ 5238:20817af258d8

pull -u: if "url#rev" was given, update to rev
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 01:44:35 -0300
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff