Mercurial > hg > mercurial-crew-with-dirclash
log hgext/imerge.py @ 5483:0c43f87baba3 default tip
age | author | description |
---|---|---|
Thu, 23 Aug 2007 22:45:41 -0700 | Brendan Cully | imerge: add automerge flag to attempt to batch merge all conflicts |
Thu, 23 Aug 2007 19:51:59 -0700 | Brendan Cully | imerge: fix ancestor calculation |