Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4034:9bd078ce8de9
Minor test-transplant cleanup
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 16 Jan 2007 12:38:26 -0800 |
parents | 20da40cc1c73 |
children | bb70d5fa02ae |