t / t4252 / file-1-0on commit merge: teach -Xours/-Xtheirs to symbolic link merge (fd48b46)
   11
   22
   33
   44
   55
   66
   77