Mercurial > hg-stable
comparison contrib/simplemerge @ 6619:170818dad56b
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 19 May 2008 10:23:47 +0200 |
| parents | abd66eb0889e |
| children | a6477aa893b8 |
comparison
equal
deleted
inserted
replaced
| 6618:876fdc73cde0 | 6619:170818dad56b |
|---|