diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2005-02-13 23:45:54 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2005-02-13 23:45:54 +0000 |
| commit | 36a142c455a41172df398f10eb3e110ca29fbf72 (patch) | |
| tree | fcca2ff76dd4bd4de63ce13f86a3138bd09a2ca3 /usr.sbin/mergemaster | |
| parent | bceab447de2643ed92a6d46e15b60a0635dd8288 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 4bac44f6618b..6dd922af7966 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -130,7 +130,7 @@ differences unless you choose context diffs. The .Nm utility will source scripts that you specify right before -it starts the comparison, and after it's done running. +it starts the comparison, and after it is done running. The easiest way to handle this is to place the path to the script(s) in the appropriate variables in your .Pa .mergemasterrc |