improved command line generic diff