# HG changeset patch # User Mads Kiilerich # Date 1320630540 -3600 # Node ID 8f08b635cdce9789bcc2b10505e0795f1d87c582 # Parent 18f1bb70462efe367532506fd48fd3b1b8bcd054 diff: always use / in paths in diff Subrepo diffs would sometimes use backslash on windows. diff -r 18f1bb70462e -r 8f08b635cdce mercurial/mdiff.py --- a/mercurial/mdiff.py Mon Nov 07 02:49:00 2011 +0100 +++ b/mercurial/mdiff.py Mon Nov 07 02:49:00 2011 +0100 @@ -100,6 +100,9 @@ return "" epoch = util.datestr((0, 0)) + fn1 = util.pconvert(fn1) + fn2 = util.pconvert(fn2) + if not opts.text and (util.binary(a) or util.binary(b)): if a and b and len(a) == len(b) and a == b: return ""