[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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?


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 is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.