diff options
author | ajacoutot <ajacoutot@openbsd.org> | 2014-09-05 17:26:08 +0000 |
---|---|---|
committer | ajacoutot <ajacoutot@openbsd.org> | 2014-09-05 17:26:08 +0000 |
commit | 8a63800e34416085a7033dc5cfbec4b558805128 (patch) | |
tree | 31d4a2fc2d27c711a9136d55323fc56a0a97c076 /usr.sbin/sysmerge/sysmerge.8 | |
parent | Sync _ignorefiles. (diff) | |
download | wireguard-openbsd-8a63800e34416085a7033dc5cfbec4b558805128.tar.xz wireguard-openbsd-8a63800e34416085a7033dc5cfbec4b558805128.zip |
Drop support for SM_MERGE. The goal is to be a less interactive as possible
so there is no point in allowing graphical merge tools to be used; especially
since it is _completely_ untested...
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 03b740c597e..8e64b387f16 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.66 2014/09/05 17:19:48 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.67 2014/09/05 17:26:08 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -50,7 +50,8 @@ run output log file. .Pp .Nm will work through the fileset, -offering the chance to merge any differences using ${SM_MERGE}. +offering the chance to merge any differences using +.Xr sdiff 1 . Merged files may be edited using the default editor or be left to deal with at a later date. Should any problems occur, @@ -148,16 +149,6 @@ the default is .Xr vi 1 . .It Ev PAGER Specifies the pagination program to use. -.It Ev SM_MERGE -Command used to merge diffs. -This will be called with three arguments: the first argument is the -output file to create, the second argument is the currently installed -file and the third argument is the reference file. -If unset, this defaults to -.Dq sdiff -as -w ${SWIDTH} -o -where -.Ev SWIDTH -is the size of the terminal. .It Ev TMPDIR Directory in which the work directory is created. If unset, this defaults to |