Mercurial > urweb
diff src/settings.sml @ 2270:1e3ba868f8bf
Merge.
author | Ziv Scully <ziv@mit.edu> |
---|---|
date | Mon, 19 Oct 2015 14:42:22 -0400 |
parents | a647a1560628 74c762002352 |
children | 985c8016b592 |
line wrap: on
line diff
--- a/src/settings.sml Thu Oct 15 00:52:04 2015 -0400 +++ b/src/settings.sml Mon Oct 19 14:42:22 2015 -0400 @@ -885,7 +885,7 @@ in case SM.find (!files, Uri) of SOME (path', _) => - if path' = path then + if OS.Path.mkCanonical path' = OS.Path.mkCanonical path then () else ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")")