comparison tests/test-http-proxy @ 4058:e7282dede8cd

filecommit: don't forget the local parent on a merge with a local rename
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 30 Jan 2007 19:09:08 -0200
parents fa4229c60dd7
children e3a0c092b4e2
comparison
equal deleted inserted replaced
4057:3600b84656d3 4058:e7282dede8cd