##// END OF EJS Templates
merge with crew-stable
Benoit Boissinot -
r5238:2b8373bd merge default
parent child Browse files
Show More
@@ -14,4 +14,4 b' chmod -w .hg/store/data/a.i'
14 echo barber > a
14 echo barber > a
15 hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed
15 hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed
16 chmod -w ../t
16 chmod -w ../t
17 hg diff
17 hg diff --nodates
@@ -14,3 +14,9 b' crosschecking files in changesets and ma'
14 checking files
14 checking files
15 1 files, 1 changesets, 1 total revisions
15 1 files, 1 changesets, 1 total revisions
16 commit failed
16 commit failed
17 diff -r c1fab96507ef a
18 --- a/a
19 +++ b/a
20 @@ -1,1 +1,1 @@ foo
21 -foo
22 +barber
General Comments 0
You need to be logged in to leave comments. Login now