Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wording changes to clarify some the options presented after

Browse Source 
a file is merged.
This commit is contained in:
apb 2006-02-19 14:56:56 +00:00
parent b4370e9bff
commit 1f082bb8d2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/etcupdate/etcupdate
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: etcupdate,v 1.24 2006/02/19 11:36:10 apb Exp $
# $NetBSD: etcupdate,v 1.25 2006/02/19 14:56:56 apb Exp $
#
# Copyright (c) 2001 The NetBSD Foundation, Inc.
# All rights reserved.
@ -286,12 +286,12 @@ ${DIFF_EXTRA_OPTIONS}
EOF
else
cat << EOF
d Don't install the new file
i Install the new file (overwrites your modifications!)
m Merge again the currently installed and new files
s Show the differences between the currently installed and new files
d Don't install the merged file (keep your old file)
i Install the merged file (overwrites your old file)
m Merge again (your old file against the result from the previous merge)
s Show the differences between the currently installed and new merged files
${DIFF_EXTRA_OPTIONS}
u Undo merge and restore the temporary file from backup
u Undo merge (start again with the original version of the new file)
v Show the merged file
EOF