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

Tree conflict question - diff

From: Kiren Pillay <kirenpillay1_at_gmail.com>
Date: Thu, 26 Jul 2012 11:04:33 +0200

Hi

I'm trying to merge my trunk into my feature branch. I'm coming up with a
lot of expected tree conflicts (shown below).

Is there an quick/shorthand way to diff this to see the differences between
the copies?

      C
business_services/main_servlet/src/main/resources/testconfigs/pams.properties
> local add, incoming add upon merge

Regards
Kiren
Received on 2012-07-26 15:29:19 CEST

This is an archived mail posted to the Subversion Users mailing list.

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