t / t5100 / patch0008on commit merge: teach -Xours/-Xtheirs to symbolic link merge (fd48b46)
   1