| Tue, 08 Aug 2006 10:56:48 -0500 | Matt Mackall | Merge: combine force and forcemerge arguments | file | diff | annotate |
| Tue, 08 Aug 2006 10:35:19 -0500 | Matt Mackall | Merge: move most tests to the beginning | file | diff | annotate |
| Tue, 08 Aug 2006 09:26:00 -0500 | Matt Mackall | Merge: refactor err and failedmerge -> unresolved | file | diff | annotate |
| Tue, 08 Aug 2006 09:19:20 -0500 | Matt Mackall | Refactor update locking slightly | file | diff | annotate |
| Tue, 08 Aug 2006 09:11:16 -0500 | Matt Mackall | Merge: combine choose and moddirstate to partial | file | diff | annotate |
| Mon, 07 Aug 2006 23:53:04 -0500 | Matt Mackall | Rename merge.allow -> merge.branchmerge | file | diff | annotate |
| Mon, 07 Aug 2006 16:47:06 -0500 | Matt Mackall | Merge with crew | file | diff | annotate |
| Thu, 03 Aug 2006 15:24:41 -0500 | Matt Mackall | Move merge code to its own module | file | diff | annotate |