Le Thu 22/07/2010, Andre Majorel disait > Anyone knows of some software that will compare two trees and, for > each file that differs, show you a diff and ask whether you want > to update the destination file ? > > It must run in a terminal (no GUI) and it must be able to access > the source tree through an SSH tunnel, like rsync. > > Thanks in advance. Isn't it what mergemaster does on FreeBSD ? -- Erwan