Mercurial > hg > mercurial-crew-with-dirclash
log hgext/imerge.py @ 5225:423f4e8be115
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 |
Mon, 13 Aug 2007 11:58:47 -0700 | Brendan Cully | imerge: simplify 1d5ebb0d366f |