diff mercurial/version.py @ 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 cff3e4b4a8de
children 003d1f174fe1
line wrap: on
line diff