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

RE: Open from... TortoiseMerge

From: Jedrek Klopot <thread.start_at_gmail.com>
Date: Fri, 4 Jul 2014 05:54:34 -0700 (PDT)

That does not answer my question;)
Right-click on the file -> Open from...TortoiseMerge. I don't have in Base file this path (see screen on the first post). Is it possible to do that?

> Copy/paste from the help section:
>
> If you want to compare / merge files you have to set at least two of the
> three possible paths for Base, Mine and Theirs. If you select only two
> files, then TortoiseMerge will show you the differences between those two
> files, either in a two pane view or in a one pane view.
>
> If you want to merge three files, TortoiseMerge will show you the
> differences in a three pane view. This view is generally used if you need
> to resolve conflicted files. The output file is not named in this case and
> you will have to use the File → Save As.... to save the results.
>
>
> Met vriendelijke groet,
> Internetbureau AddVision
>
>
> Sander Boele
>
>
>
> -----Oorspronkelijk bericht-----
> Van: Jedrek Klopot [mailto:thread dot start at gmail dot com]
> Verzonden: vrijdag 4 juli 2014 12:59
> Aan: users at tortoisesvn dot tigris dot org
> Onderwerp: Open from... TortoiseMerge
>
> Hello
> I often use TortoiseMerge for merge two any files. I Open from...
> TortoiseMerge one file. I don't have in Base file this path. I want to
> like in WinMerge...;)
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId
> =3084526
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe at tortoisesvn dot tigris dot org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084536

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-07-04 14:56:40 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.