[hatari-devel] Mercurial & Diffs

Matthias Arndt marndt at asmsoftware.de
Fri Feb 6 18:57:23 CET 2009


Hello Tobe,

Am Freitag, den 06.02.2009, 12:51 +0100 schrieb Jean-Baptiste Berlioz:
> I've customized my .hgrc to create extra diff commands:
> 
> [extensions]
> extdiff=
> 
> [extdiff]
> cmd.xdiff = meld
> cmd.cdiff = diff
> opts.cdiff = -w -y
> 
> 
> Meld is a x11/gtk diff/merge tool.
> 
> Diff is the standard diff command, -w removes whitespaces differences 
> and -y create a two columns diff (need a pager to display it correctly).
> 
> When i'm working under x11, i can type 'hg xdiff file.c' and when i'm 
> working in a console 'hg cdiff file.c', so now i can easily watch my 
> changes in all cases.

This is actually something really useful! Thanks for sharing :)
I configured my Mercurial to use kdiff3 instead. Using this at work too
so I'm a bit used to it.

cheers,
Matthias
-- 
Matthias Arndt <marndt at asmsoftware.de>
PGP-Key: http://www.final-memory.org/files/marndt.asc   ICQ: 40358321
>>> Jabber: simonsunnyboy at jabber.ccc.de <<<





More information about the hatari-devel mailing list