[arch-general] CLI diffing tool other than Vim?

[Paul Gideon Dann]

On Tuesday 30 Jul 2013 14:26:31 phanisvara wrote:
> On Tuesday 30 Jul 2013 09:43:02 Paul Gideon Dann wrote:
> > Does anyone know of
> > any good & simple(ish) alternative for merging files over SSH?
> 
> nano, or mc with it's in-built editor.

They don't have a diffing/merging mode, do they?

Paul