diff options
| author | dougb <dougb@FreeBSD.org> | 2001-05-28 13:10:16 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2001-05-28 13:10:16 +0000 |
| commit | 397abaa1892a53f15bba1c3366e5070bda5277b9 (patch) | |
| tree | e92c76264a9533abafdccbcbd6ee5c828899ee86 /usr.sbin/mergemaster | |
| parent | 68d3eccc3a5859b2996425370174c70d54228d41 (diff) | |
| download | FreeBSD-src-397abaa1892a53f15bba1c3366e5070bda5277b9.zip FreeBSD-src-397abaa1892a53f15bba1c3366e5070bda5277b9.tar.gz | |
Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrc
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index b774b4d..ebd4b1d 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -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 |
