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