diff3.1: update manual page to match code
(cherry picked from commit e8ff95356ceaaa941251056e9d0a4211bf428e06)