diff options
author | Chris Rees <crees@FreeBSD.org> | 2014-03-24 20:30:00 +0000 |
---|---|---|
committer | Chris Rees <crees@FreeBSD.org> | 2014-03-24 20:30:00 +0000 |
commit | d34d662a2962b84188664d4e92455bc88f33f68f (patch) | |
tree | 2b423e7f33076deac370ef858334a617006fccac /Tools | |
parent | d9b74e1fd20192c35f7ef5fcce30ba2ff8dcf9ee (diff) | |
download | ports-d34d662a2962b84188664d4e92455bc88f33f68f.tar.gz ports-d34d662a2962b84188664d4e92455bc88f33f68f.zip |
Fix cdiff
Reported by: swills
Notes
Notes:
svn path=/head/; revision=349064
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/scripts/rmport | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport index 8025e1ce1ac5..f115fb073091 100755 --- a/Tools/scripts/rmport +++ b/Tools/scripts/rmport @@ -47,7 +47,7 @@ SED="sed -i .orig -E" SVNREPO=${SVNREPO:-svn+ssh://svn.FreeBSD.org/ports} if ! CDIFF=$(which cdiff) ; then - CDIFF=${EDITOR} + CDIFF=${PAGER} fi log() @@ -529,7 +529,7 @@ answer=y while [ "${answer}" = "y" ] ; do diffout=$(diff) - ${CDIFF} ${diffout} + ${CDIFF} < ${diffout} echo "" >&2 echo "you can now edit files under ${codir}/ by hand" >&2 |