Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 1293:a6ffcebd3315
Enhance the file filtering capabilities.
We now allow filtering through either pipes or pairs of temporary
files. The latter appear to be mandatory for use on Windows.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 21 Sep 2005 11:44:08 -0700 |
parents | 9c918287d10b |
children | 696851b1bba9 |
comparison
equal
deleted
inserted
replaced
1292:141951276ba1 | 1293:a6ffcebd3315 |
---|