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