| 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:53:16 +0200 |
Benoit Boissinot |
merge with crew-stable
|
| Fri, 24 Aug 2007 00:39:59 +0200 |
Benoit Boissinot |
merge with crew-stable
|
| Thu, 23 Aug 2007 13:59:52 -0700 |
Brendan Cully |
mq: some improvements to header rewriting (closes #690)
|
| Thu, 23 Aug 2007 12:24:54 -0700 |
Brendan Cully |
Merge with crew-stable
|
| Fri, 31 Aug 2007 22:31:43 +0200 |
Benoit Boissinot |
merge with crew-stable
|
| Fri, 31 Aug 2007 22:31:03 +0200 |
Benoit Boissinot |
fix the dummy 00changelog.i not being copied on clone
|
| Fri, 31 Aug 2007 12:32:18 +0200 |
Thomas Arendsen Hein |
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
|
| Wed, 29 Aug 2007 16:15:23 -0700 |
Brendan Cully |
When reverting a file which was renamed, also revert the old name
|
| Mon, 27 Aug 2007 14:21:04 -0300 |
Alexis S. L. Carvalho |
correctly record file-level history when the local side renames a directory
|
| Mon, 27 Aug 2007 14:21:04 -0300 |
Alexis S. L. Carvalho |
Fix theoretical issue in filecommit.
|
| Mon, 27 Aug 2007 14:21:04 -0300 |
Alexis S. L. Carvalho |
Avoid adding to the changelog executable files added by the second parent.
|
