Mon, 21 Aug 2006 14:25:56 -0500 |
Matt Mackall |
merge: rename mysterious variable
|
Mon, 21 Aug 2006 14:21:42 -0500 |
Matt Mackall |
merge: add backwards variable
|
Tue, 15 Aug 2006 23:17:06 -0500 |
Matt Mackall |
merge: consolidate dirstate updates
|
Tue, 15 Aug 2006 22:46:35 -0500 |
Matt Mackall |
merge: use file size stored in revlog index
|
Tue, 15 Aug 2006 18:30:21 -0500 |
Matt Mackall |
merge: move forgets to the apply stage
|
Tue, 15 Aug 2006 18:12:36 -0500 |
Matt Mackall |
trivial bool() cleanup
|
Tue, 15 Aug 2006 16:27:19 -0500 |
Matt Mackall |
merge: hoist some working manifest logic out of merge loop
|
Tue, 15 Aug 2006 16:12:51 -0500 |
Matt Mackall |
merge: working manifest new/changed
|