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

svn merge conflicts

From: Ravi Bavanari <ravi.bavanari_at_gmail.com>
Date: Tue, 24 Jun 2008 12:01:11 -0700

Hi All ,

can some one help me in explaining in finding what is the revision of this
working file as below

? httpads/create-advars.js.merge-right.r29843
? httpads/create-advars.js.merge-left.r0
? httpads/create-advars.js.working
C httpads/create-advars.js

Thanks in advanve

Ravi Bavnari
Received on 2008-06-24 21:01:38 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.