merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
[alt-git.git] / t / t9121 / 
tree6fc311770f059d72ddfdc3b46365a6065fe5c225
drwxr-xr-x   ..
-rw-r--r-- 1046 renamed-dir.dump