merge: teach -Xours/-Xtheirs to symbolic link merge