changeset 163:74f38b519887

got octomerges working
author Scott Chacon <schacon@gmail.com>
date Wed, 27 May 2009 17:28:01 -0700
parents cb38ac7f9373
children 7e98757deadc
files README.md
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Wed May 27 17:27:23 2009 -0700
+++ b/README.md	Wed May 27 17:28:01 2009 -0700
@@ -1,6 +1,6 @@
 *Warning: This plugin is not yet stabilized. Use to help me identify bugs, but it will be a few weeks before its fully stable.*
 
-*Project status as of 5/27:*  Pretty solid, but a bit slow - can losslessly convert most major scenarios and can handle projects up to several thousand commits. Submodules and octopus merges in Git are not handled. See TODO.txt for full list of things I'm working on.
+*Project status as of 5/27:*  Pretty solid, but a bit slow - can losslessly convert most major scenarios and can handle projects up to several thousand commits. Submodules in Git are not handled. See TODO.txt for full list of things I'm working on.
 
 
 Hg-Git Mercurial Plugin