Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-pull-mirror-test2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
heptapod
Testing Projects
hg-pull-mirror-test2
Commits
2f424fc4edb3
Commit
2f424fc4edb3
authored
17 years ago
by
Matt Mackall
Browse files
Options
Downloads
Patches
Plain Diff
mergetools: correct vim typo
parent
bb441d77df99
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/mergetools.hgrc
+1
-1
1 addition, 1 deletion
contrib/mergetools.hgrc
with
1 addition
and
1 deletion
contrib/mergetools.hgrc
+
1
−
1
View file @
2f424fc4
...
...
@@ -8,7 +8,7 @@
kdiff3.gui=True
gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vi
n
\GVim
gvimdiff.regkey=Software\Vi
m
\GVim
gvimdiff.regname=path
gvimdiff.priority=-9
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment