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:52:15 -0700 |
Brendan Cully |
Merge with crew
|
Thu, 23 Aug 2007 19:51:59 -0700 |
Brendan Cully |
imerge: fix ancestor calculation
|
Fri, 24 Aug 2007 00:56:56 +0200 |
Benoit Boissinot |
merge with crew-stable
|
Fri, 24 Aug 2007 00:56:08 +0200 |
Benoit Boissinot |
fix test-permissions output
|
Fri, 24 Aug 2007 00:53:16 +0200 |
Benoit Boissinot |
merge with crew-stable
|
Fri, 24 Aug 2007 00:52:28 +0200 |
Benoit Boissinot |
testcase for issue705 (fixed by 316ce5e85b3e)
|
Fri, 24 Aug 2007 00:39:59 +0200 |
Benoit Boissinot |
merge with crew-stable
|