Their strengths and weaknesses make them ideal for different. 5 # Therefore redistribution and use in source and binary forms, with or without 6 # modification, are permitted provided the following disclaimer is accepted: 7 # 8 # 9 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND THE ESRF ``AS IS'' AND ANY 10 # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 11 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 12 # DISCLAIMED. Mercurial and Git both are two quite similar and most popular distributed version control systems. 4 # Given the nature of this work, these module can be considered public domain. Sole, from the European 3 # Synchrotron Radiation Facility (ESRF) to build a frozen version of PyMca. Specific use case: >From Windows Explorer I find the file of interest and right-click and select Hg Repository Explorer which opens the explorer w/ Keywords set to select only changesets containing my file of interest. Mercurial is primarily a command line program. News The last version with python 2.7 support is 6.1.3. It also includes a Gnome/Nautilus extension and a CLI wrapper application so the TortoiseHg tools can be used on non-Windows platforms. Heres a sample merge-tool settings for kdiff3: merge-tools kdiff3. Git and Mercurial are both free software tools for distributed revision control and software source code. TortoiseHg is a Windows shell extension and a series of applications for the Mercurial distributed revision control system. If you can provide the merge-tool setting to support winmerge, perhaps I can add it into the default mercurial.ini, so Mercurial will pick it up if its installed. It is included in the TortoiseHg installer for Windows. For 3-way merge it can show both the 2 parent versions and their common ancestor side-by-side in top panes and the editable merge result in the bottom pane. 1 # 2 # These Python module have been developed by V.A. So I was wondering if there is a way to invoke the visual diff tool through the TortoiseHg interface. We are preparing the next release of TortoiseHg. KDiff3 is a KDE / Qt graphical merge and diff tool.
0 Comments
Leave a Reply. |