On Mon, Apr 22, 2013 at 11:43 AM, Steve Borho <[email protected]> wrote:
>
>
>
> On Mon, Apr 22, 2013 at 11:34 AM, <[email protected]>wrote:
>
>> Thank you for the useful feedback. Looks like I can't achieve what I want.
>>
>> In the interest of fewer bugs: I still think that there is a defect in
>> either the TortoiseHg documentation or the code regarding the $ancestor
>> variable for diff3args. It does not get expanded.
>>
>
> Indeed, it's a rather egregious bug at that. The documentation and
> shipped mergetools.rc all use diff3args but the code only uses dir3diff
> (implying it mainly cares about 3-way directory compare)
>
Actually, I misread this. diff3args is used correctly in hglib.py's diff
tool routine. dir3diff is a separate boolean flag that describes whether
your selected tool can handle 3-way directory diffs.
So, not ruling out any bugs, but this code looks ok.
--
Steve Borho
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
