t / t4100 / t-apply-9.expecton commit merge: teach -Xours/-Xtheirs to symbolic link merge (fd48b46)
   1 t/t4100-apply-stat.sh |    2 +-
   2 1 file changed, 1 insertion(+), 1 deletion(-)