t / t5100 / msg0006on commit merge: teach -Xours/-Xtheirs to symbolic link merge (fd48b46)
   1Here is a patch from A U Thor.
   2