# HG changeset patch # User Matt Harbison # Date 1429287074 14400 # Node ID fff8b779e63aa95bef1e85ba0d2aa89baf7054b2 # Parent 61aea11fb83dd661dc47000ef2b96955d323d068 test-add.t: fix output difference between Windows and OS X (issue4603) diff -r 61aea11fb83d -r fff8b779e63a tests/test-add.t --- a/tests/test-add.t Fri Apr 17 23:22:58 2015 +0900 +++ b/tests/test-add.t Fri Apr 17 12:11:14 2015 -0400 @@ -206,8 +206,10 @@ $ hg revert -r '.^' capsdir1/capsdir reverting CapsDir1/CapsDir/SubDir/Def.txt (glob) +The conditional tests above mean the hash on the diff line differs on Windows +and OS X $ hg diff capsdir1/capsdir - diff -r 5112e00e781d CapsDir1/CapsDir/SubDir/Def.txt + diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob) --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 +++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob) @@ -1,1 +1,1 @@