Re: Tortoise Merge: tweaks to help and/or changes to context menu.

Simon Large wrote:

>> 1. Clarify the location to click on. "As in two pane view, you can
>> right-click on conflicted lines /in the bottom pane/". Also mention
>> the options available when you right-click on either of the files in
>> the top area.
>>
>> 2. Change the options available in the context menu. It seems to me
>> that you could have "Use text block from “mine” before “theirs”" (and
>> vice versa) in the context menu for both top-level panes.
>
>
> Stefan, which option do you prefer? Doc change or behaviour change?

Implemented option 2 in revision 4702.

>> B. Save after merge?
>> ====================
>>
>> After using blocks from both sides, I then clicked on "Mark as
>> resolved". All good. The resolved file was automatically loaded into
>> my editor (as it had been open at the time, prior to merging). Looks
>> good. But when I closed Tortoise Merge I was asked:
>>
>> ---------------------------
>> TortoiseMerge
>> ---------------------------
>> Do you want to save your changes?
>> ---------------------------
>> Yes No Cancel ---------------------------
>>
>> They were already saved...
>
>
> I will leave that to Stefan.

Fixed in revision 4703.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org