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

[Fwd: What are the switches and params for merging with WinMerge?]

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 30 Jul 2008 16:31:25 +0200

Forwarding to the users mailing list: do not send mails to the
developers directly please.

-------- Original Message --------
Subject: What are the switches and params for merging with WinMerge?
Date: Wed, 30 Jul 2008 15:11:49 +0300
From: Serhio <gserhio_at_gmail.com>
To: <tortoisesvn_at_gmail.com>

Hello, SVN experts

I am using the latest (I hope) version at moment

(TortoiseSVN 1.5.1, Build 13563 - 32 Bit , 2008/07/26 09:47:57,
Subversion 1.5.1, apr 1.2.12,apr-utils 1.2.12,berkeley db 4.4.20,neon
0.28.2,OpenSSL 0.9.8g 19 Oct 2007, zlib 1.2.3)

What are the recommended Switches and params for merging with WinMerge?

/I tried /
/"C:\Program Files\WinMerge\WinMergeU.exe" %merged /
(like is indicated in the our documentation
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html
) /into External Programs/Merge Tool, but this launched WinMerge with
open compare dialog, having mine file in the “left”, and no file at the
right. /

/ /

/As I can see the
http://svn.haxx.se/tsvnusers/archive-2008-05/0429.shtml there appeared
similar problems in the previous versions. ///

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-30 16:32:08 CEST

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

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