Mercurial > p > roundup > code
diff doc/spec.html @ 3145:9aa9436a81e0
better edit conflict handling
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Sun, 13 Feb 2005 22:04:32 +0000 |
| parents | b9c1226cb600 |
| children |
| author | Richard Jones <richard@users.sourceforge.net> |
|---|---|
| date | Sun, 13 Feb 2005 22:04:32 +0000 |
| parents | b9c1226cb600 |
| children |