Junio C Hamano <gitster@xxxxxxxxx> writes: > + sed -ne "s/^@@[^@]*@@//p" actual | > + if test -n "$HEAD" > + then > + grep -F "$HEAD" I think this should also use "-x" (match the whole line) if it is portable enough; the option should be available in POSIX.1 but we haven't used it anywhere in our test suite. > + else > + grep "^.*RIGHT" > + fi > + ' > done