diff doc/hgmerge.1.txt @ 4204:f9bbcebcacea

"default" is the default branch name
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 13 Mar 2007 15:02:33 -0300
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff