merging & hgignore

[Pierre-Yves David]

On Thu, Jun 30, 2011 at 08:06:20AM -0700, watlab wrote:
> Thanks. So there is no easy way, if "file2" in reality is a whole bunch of
> files? 

In mercurial 1.9 (to be release tomorrow) you will have a fileset entry for ignored file.


-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20110630/cbfb6b87/attachment.pgp>