Re: TortoiseMerge not working in nightly

Stefan Küng wrote:
> Roel Harbers wrote:
>> TortoiseMerge doesn't show up when I do a "Diff" from the explorer
>> context menu or a "Compare with base" from the commit or check for
>> modifications dialog. The TortoiseMerge process does start, takes 100%
>> cpu, and won't terminate. If I try again, more TortoiseMerge processes
>> start, all taking as much CPU as they can get.
>
> Can't reproduce that.
> Does it happen with every file you diff? Or just some files?

It happened with every file I tried.

> What are the settings you have in TMerge? (lineendings, whitespaces, ...)

The screenshot shows the current settings (I had to get work done, so I
uninstalled the nightly and installed the 1.3.2 version again, so I took
the screenshot in that version. I didn't change settings after
installing the nightly)

Resolve on save is on, and whitespace is shown. (off-topic question: is
there a special reason why the "Whitespace" option is not on the
settings dialog, like "Show linenumbers" and "Show line diff bar"? Seems
a bit inconsistent)

I use two monitors, and TortoiseMerge normally opens on the second
monitor (to the right).

I'll try installing the nightly again when I have some time, and see
what it does.

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org