working with MQ rejected files

0000 vk 0000.vk at gmail.com
Tue Mar 3 15:00:35 CST 2009


[...]


>
>  wiggle --replace file.py file.py.rej
>
> You can then examine the result of the wiggle merge using 'hg diff
> file.py'.
>
> Hope this helps! (and thanks for reminding me about Emacs diff mode ;-) )
>
> -- Christian
>

great! indeed it helps a lot. thanks.
vk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20090303/142b8740/attachment.htm 


More information about the Mercurial mailing list