log

age author description
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: pull file-merging code into its own module
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core
Sun, 03 Feb 2008 21:47:07 -0200 Alexis S. L. Carvalho merge with crew-stable