In fact, I just checked and gpyfm has been removed from the opensolaris
repository and doesn't appear to have been moved to greener pastures.
That said, Mercurial can fixup these line ending problems if you tell it to
(with the fixeol property in the [merge-tools] section of your
Mercurial.ini). There aren't a lot of open-source Windows native 3-way
merge tools to chose from for bundling purposes beyond kdiff3 and gpyfm.
On Wed, Jun 4, 2008 at 9:01 PM, Steve Borho <[EMAIL PROTECTED]> wrote:
> The tortoisehg binary installers have included both kdiff3 and gpyfm since
> last December. Though I've been thinking about unbundling gpyfm since it
> has died on a couple of non-trivial merges on me and I haven't seen any new
> commits for it in quite some time.
>
>
> On Wed, Jun 4, 2008 at 8:56 PM, TK Soh <[EMAIL PROTECTED]> wrote:
>
>> On Thu, Jun 5, 2008 at 2:51 AM, Peter Ruibal <[EMAIL PROTECTED]> wrote:
>> > The original file was checked out in UNIX mode (opening with notepad
>> shows
>> > all 1 line).
>> >
>> > After editing the file, opening with notepad shows 1 line.
>> >
>> > After merging the file (on hg up, but before commit), opening with
>> notepad
>> > shows multiple lines.
>> >
>> > The graphical merge tool i'm using is "gpyfm," Was this part of thg or
>> hg?
>>
>> Neither hg nor thg provide an internal GUI merge tool.
>>
>> -------------------------------------------------------------------------
>> Check out the new SourceForge.net Marketplace.
>> It's the best place to buy or sell services for
>> just about anything Open Source.
>> http://sourceforge.net/services/buy/index.php
>> _______________________________________________
>> Tortoisehg-develop mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
>>
>
>
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
