merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
[alt-git.git] / t / t9153 / 
tree12eb60fa26fce56958722e8a9ad2c1d2756e4367
drwxr-xr-x   ..
-rw-r--r-- 1002 svn.dump