Confirmed users
566
edits
NSS:NewHGLayout: Difference between revisions
Jump to navigation
Jump to search
→One-time preparation
| Line 2: | Line 2: | ||
=One-time preparation= | =One-time preparation= | ||
Create a file in your home directory, named .hgrc with the follwing contents, in order to set your preferred 3-way merge tool, your name and email, your preferred diff options, the style of diff/patch output, and to enable to mq and rebase extensions: | Create a file in your home directory, named .hgrc with the follwing contents, in order to set your preferred 3-way merge tool, your name and email, your preferred diff options, the style of diff/patch output, tell the log command to follow moves, and to enable to mq and rebase extensions: | ||
[ui] | [ui] | ||
merge = kdiff3 | merge = kdiff3 | ||
| Line 9: | Line 9: | ||
diff=-U 8 -p | diff=-U 8 -p | ||
qdiff=-U 8 | qdiff=-U 8 | ||
log = -f | |||
[diff] | [diff] | ||
git = 1 | git = 1 | ||