]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ed48927) | patch
* Document the -P option
authordougb <dougb@FreeBSD.org>
Fri, 2 May 2003 06:28:30 +0000 (06:28 +0000)
committerdougb <dougb@FreeBSD.org>
Fri, 2 May 2003 06:28:30 +0000 (06:28 +0000)
commita50936449c3b72a8409e56cd2f6f3f777691331c
treed75a589ef3c3ad3aa18940813fed9b8b0ddec33ftree | snapshot
parented489277de58a4ebc62afc800597ab0fb2f9e8fecommit | diff
* Document the -P option

* Add a paragraph suggesting that the merge option be used only for
files that users have modified. People have been using this option
for all files that are different, causing unecessary confusion.
usr.sbin/mergemaster/mergemaster.8 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.