Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • thg thg
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 833
    • Issues 833
    • List
    • Boards
    • Service Desk
    • Milestones
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar

April 05-07 - Mercurial Paris Conference 2023 - One day of workshop dedicated to Heptapod and Mercurial usage and workflow. There are still places available for both workshops and talks!

  • mercurialmercurial
  • TortoiseHgTortoiseHg
  • thgthg
  • Wiki
  • SVN

SVN · Changes

Page history
No commit message authored Mar 28, 2011 by Asion Tang's avatar Asion Tang
No commit message
Hide whitespace changes
Inline Side-by-side
SVN.wiki
View page @ a15de0f6
......@@ -63,23 +63,23 @@ By default, TortoiseHg will use [[http://kdiff3.sourceforge.net/|kdiff3]] (a gra
# If you have TortoiseSVN installed and prefer TortoiseMerge you can
select TortoiseMerge from the drop-down list.
# 假如你已经安装了TortoiseSVN,并且更喜欢使用TortoiseMerge 工具的话,你同样可以在下拉框中选择它。
假如你已经安装了TortoiseSVN,并且更喜欢使用TortoiseMerge 工具的话,你同样可以在下拉框中选择它。
# If you prefer P4Merge, or some other tool supported by Mercurial, it will
automatically show up in the drop-down list.
# 假如你更喜欢P4Merge,或者别的支持Mercurial的工具,都会自动显示在下拉框中。
假如你更喜欢P4Merge,或者别的支持Mercurial的工具,都会自动显示在下拉框中。
# If you want Mercurial to write the .BASE .LOCAL .OTHER versions for
you to manually merge, chose internal:dump
# 假如你想让Mercurial在手动合并的时候能修改 .BASE .LOCAL .OTHER 版本,请选择internal:dump.
假如你想让Mercurial在手动合并的时候能修改 .BASE .LOCAL .OTHER 版本,请选择internal:dump.
# If you want Mercurial to prompt you whether to keep either the local
or other version, chose internal:prompt
# 假如你想让 Mercurial 提示你是否保留本地版本或其它版本,请选择internal:prompt
假如你想让 Mercurial 提示你是否保留本地版本或其它版本,请选择internal:prompt
# If you want Mercurial to perform trivial merges internally, and leave
conflict markers in place on conflicts, chose internal:merge
# 假如你想让 Mercurial 能够执行琐碎的内部合并,并且在出现冲突的地方留下标记,请选择internal:merge
假如你想让 Mercurial 能够执行琐碎的内部合并,并且在出现冲突的地方留下标记,请选择internal:merge
See
[[http://www.selenic.com/mercurial/hgrc.5.html#merge-tools|merge-tools]]
......
Clone repository
  • BugReport
  • CentOS
  • FixedBugs
  • Home
  • KeySequences
  • Nit
  • OldNews
  • OlderReleaseNotes
  • OpenAtLine
  • ReleaseNotes
  • RoadMap
  • SVN HG
  • SVN
  • Ubuntu
  • developers
    • CommonSignals
View All Pages