From: Kimmo Varis <kimmov@ko...> - 2005-01-13 22:28:58
> I would like to know where I can find instructions on how to call
> winmerge from wincvs such that instead of messing up my files with merge
> conflicts i get winmerge started automatically and i can manually do the
> merge ...
I don't know if that's possible with WinCVS. You can set WinMerge as
external diff tool, but that doesn't help with merging I think? And
even if you set WinMerge as diff tool, you have to use batch file (like
described in Manual's FAQ since WinCVS cannot parse commandlines
Well, I think some script could be written for WinCVS, but I know
nothing about those WinCVS scripts. You should ask about those in
WinCVS/cvsqui mailing list..
Kimmo Varis - kimmov@...