[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: Sander <sander_at_addvision.nl>
Date: Fri, 4 Jul 2014 14:17:23 +0200 (CEST)

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.start_at_gmail.com]
Verzonden: vrijdag 4 juli 2014 12:59
Aan: users_at_tortoisesvn.tigris.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.tigris.org].

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

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