Mercurial > hg
comparison contrib/simplemerge @ 10918:1d8a13bb42ae
add +x to test-update-renames, removed by the merge on 24ed7a541f23
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 15 Apr 2010 15:34:27 +0200 |
parents | bb9f13974d8e |
children | 659f34b833b9 |
comparison
equal
deleted
inserted
replaced
10915:c9543bc6be16 | 10918:1d8a13bb42ae |
---|