diff doc/hgrc.5.txt @ 5241:3786ef8877d5

imerge: add automerge flag to attempt to batch merge all conflicts
author Brendan Cully <brendan@kublai.com>
date Thu, 23 Aug 2007 22:45:41 -0700
parents ea7b982b6c08
children 1b5b81d9039b
line wrap: on
line diff