Is merge broken with external merge tool kdiff3?

[Arne Babenhauserheide]

Am Samstag 11 April 2009 10:48:50 schrieb Jeffrey A. Zelt:
> I am  
> planning to try to introduce Mercurial at work, where we currently us  
> CVS.  That might take some teeth pulling, but in the long run it will  
> be good for them :-)

Before you introduce it, please use it for some time and try every workflow 
you want to show. 

Only show stuff you already tried, and use the cool things at home, before you 
show them as solutions to problems of others. 

Sorry if I stated the obvious - I ignored the second advice often enough, that 
I learned that it's quite crucial. 

When showing something to someone who might be resistant to it, you should be 
sure that you know it as in "I do this every day, and I can explain it to my 
daugther", because there will be unexpected problems cropping up anyway - you 
really won't need expected ones to strengthen these ;) 

Best wishes, 
Arne
-- 
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt