summaryrefslogtreecommitdiff
path: root/regress/usr.bin/rcs/merge-eflag.out
AgeCommit message (Expand)Author
2006-08-11add tests for merge -e; OK ray@.Xavier Santolaria