merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
[alt-git.git] / t / t9700 / 
tree28a0e7bf87d254eec8128c980f18df4ec0e9b3bd
drwxr-xr-x   ..
-rwxr-xr-x 4963 test.pl