In either case, whenĬonflicts occur, the user will be invited to review and resolveĬhanges manually. If the edits are to different parts of the file. When False, all files withĬhanges on both sides of the merge will report as conflicting, even Default: False Auto-resolve merges: Indicates whether TortoiseHg should attempt to automatically resolveĬhanges from both sides to the same file, and only report mergeĬonflicts when this is not possible. Full Path Title: Show a full directory path of the repository in the dialog title Fork GUI: When running thg from the command line, fork a background process Show changes for in the changelog, status, and commit windows.Ī value of zero implies no limit. Default: False Monitor Repo Changes: Specify the target filesystem where TortoiseHg monitors changes.ĭefault: localonly Max Diff Size: The maximum size file (in KB) that TortoiseHg will Default: 8 Force Repo Tab: Always show repo tabs, even for a single repo. Default: None (leave blank) Tab Width: Specify the number of spaces that tabs expand to in various Performed immediately, without user interaction. (restart needed) Default, Windows: cmd.exe /K title %(reponame)s Default, OS X: not set Default, other: xterm -T "%(reponame)s" Immediate Operations: Space separated list of shell operations you would like to be Similarly, %(root)s will be the full path to ![]() Name of the repository will be substituted in place of If the value includes the string %(reponame)s, the ![]() Specify the command to launch your preferred terminal shellĪpplication. CLI Editor: The editor used by Mercurial command line commands to collect Will use the first applicable tool it finds. Visual Editor: Specify visual editor, as described in the section TortoiseHg will use the selected merge tool. Visual Diff Tool: Specify visual diff tool as described in the section Or other, or internal:dump to leave files in the workingĭirectory for manual merging. Chose internal:merge to forceĬonflict markers, internal:prompt to always select local On your system or use its internal merge tool that leaves conflict Unspecified, Mercurial will use the first applicable tool it finds TortoiseHg ¶ UI Language: Specify your preferred user interface language (restart needed) 3-way Merge Tool: Graphical merge program for resolving merge conflicts. The user and repository configuration files may not exist until you runĦ.1.1. Override many configurables per-repository (a common example is toĬonfigure a username for use in a specific repository). (remote repository aliases) and web settings, though it is possible to Global user settings, and only use the repository hgrc to store paths Most TortoiseHg users will want to store all configurables in their The dialog, or directly edit the file in your configured visual editor. ![]() You may toggle between the two modes using the combo box at the top of Suggestion by only operating in two modes: Global edits your user Mercurial.ini file Repository edits a repository. The TortoiseHg Settings dialog enforces this Instead, you should makeĬhanges to your user Mercurial.ini and/or the repository That you do not make changes to this file. The site-wide file can be overwritten on upgrades so it is recommended
0 Comments
Leave a Reply. |