merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
[git/git-svn.git] / contrib / patches / 
treebb0bded78d41afa2a1131e188220a4800fd14286
drwxr-xr-x   ..
-rw-r--r-- 883 docbook-xsl-manpages-charmap.patch