Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

From: Erik Enge <eenge_at_prium.net>
Date: 2005-10-17 23:27:04 CEST

Quoting Ben Collins-Sussman <sussman@red-bean.com>:

> This mail was already discussed a few days ago. Here's the thread:

Ouch, apologies!

How about a config option? run_diff3_twice=yes or whatever in the
site-wide config file?

Thanks,
Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 17 23:27:47 2005

This message: [ Message body ]
Next message: Max Bowsher: "svn@... and issues@... moderation status"
Previous message: Erik Huelsmann: "Re: Does SVN transmit file deltas?"
In reply to: Ben Collins-Sussman: "Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]