comparison doc/hgmerge.1.txt @ 4211:1253703853a8

git-send-email compatibility: stop reading changelog after ^---$
author Brendan Cully <brendan@kublai.com>
date Wed, 14 Mar 2007 11:46:07 -0700
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
4210:6cb5be6bd70f 4211:1253703853a8