http://diffuse.sourceforge.net/
Has anyone on this list had any experience with this tool? It looks like it would be an excellent match with TortoiseHg. It's written in Python/GTK, supports Mercurial repositories natively (can retrieve file revisions, etc), does 2-way and 3-way merges, and even has a Windows installer. Did I mention it's GPL2? This looks like it could be a good candidate to include natively with TortoiseHg (as source) but still produce an EXE for it. Then we could drop gpyfm (if we haven't already) and kdiff3. That would leave just Qct as the only Qt app left in the installer. I've done some preliminary testing with it and it seems at least adequate. I'm curious if any others have had more in depth experience with it. Happy Holidays everyone. -- Steve
------------------------------------------------------------------------------
_______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
