etc-update when using the interactive merge facility should accept '<' and '>' in addition to 'r' and 'l'.
*** This bug has been marked as a duplicate of 22296 ***
etc-update doesnt do the merging, diff does