Fix cdiff
Reported by: swills
This commit is contained in:
parent
d9b74e1fd2
commit
d34d662a29
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=349064
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user