Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5.out @ 776:7635a3f14ad4
Add template to mktemp call
Based on a patch from Soh Tk-r28629
| author | mpm@selenic.com |
|---|---|
| date | Tue, 26 Jul 2005 19:27:05 -0800 |
| parents | 61ed30e82b27 |
| children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
| 775:122449dd89db | 776:7635a3f14ad4 |
|---|