I'm using mercurial for revision control in Windows, but I'd like to use a nice merge tool like TortoiseGitMerge. How can I tell Mercurial to use TortoiseGitMerge for merge conflicts?
How do I use tortoisegitmerge with mercurial?
257 views Asked by Josh Kodroff At
2
There are 2 answers
2
Josh Kodroff
On
Ensure that you have installed TortoiseGit.
Then, edit or create %userprofile%\.hgrc (e.g. c:\users\YOUR_USER_NAME\.hgrc) and add the following:
[extdiff]
cmd.tortoisegitmerge = c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe
[merge-tools]
tortoisegitmerge.args = -base $base -mine $local -theirs $other -merged $output
Related Questions in MERCURIAL
- MySQL Select Rank
- When dealing with databases, does adding a different table when we can use a simple hash a good thing?
- Push mysql database script to server using git
- Why does mysql stop using indexes when date ranges are added to the query?
- Google Maps API Re-size
- store numpy array in mysql
- Whats wrong with this query? Using ands
- MySQL-Auto increment
- show duplicate values subquery mysql
- Java Web Application Query Is Not Working
Related Questions in TORTOISEGIT
- MySQL Select Rank
- When dealing with databases, does adding a different table when we can use a simple hash a good thing?
- Push mysql database script to server using git
- Why does mysql stop using indexes when date ranges are added to the query?
- Google Maps API Re-size
- store numpy array in mysql
- Whats wrong with this query? Using ands
- MySQL-Auto increment
- show duplicate values subquery mysql
- Java Web Application Query Is Not Working
Related Questions in TORTOISEGITMERGE
- MySQL Select Rank
- When dealing with databases, does adding a different table when we can use a simple hash a good thing?
- Push mysql database script to server using git
- Why does mysql stop using indexes when date ranges are added to the query?
- Google Maps API Re-size
- store numpy array in mysql
- Whats wrong with this query? Using ands
- MySQL-Auto increment
- show duplicate values subquery mysql
- Java Web Application Query Is Not Working
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
Popular Tags
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Good [merge-tools] section for TortoiseGitMerge (extracted from TortoiseHG's
hgrc.d\MergeTools.rc) for single merge-tool only (Merge Tool Configuration wiki-page used for reference)For more than 1 merge tool
tortoisegitmerge.prioritykey with some priority have to added. In order to ignore priority-list and use always preselected from possible choices merge-tool, useIn global or repository-specific ini-file