Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc
This commit is contained in:
parent
8e46d9c279
commit
00894211bd
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77334
@ -260,11 +260,16 @@ comparison, use:
|
||||
.Dl # mergemaster -sw 110
|
||||
.Sh FILES
|
||||
.Bl -ohang
|
||||
.It Pa /etc/mergemaster.rc
|
||||
.It Pa $HOME/.mergemasterrc
|
||||
.Pp
|
||||
.Nm
|
||||
will . (source) this file if it exists.
|
||||
will . (source) these files if they exist.
|
||||
Command line options
|
||||
will override rc file options.
|
||||
.Pa $HOME/.mergemasterrc
|
||||
overrides
|
||||
.Pa /etc/mergemaster.rc .
|
||||
Here is an example
|
||||
with all values commented out:
|
||||
.Pp
|
||||
|
Loading…
Reference in New Issue
Block a user