Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-conflict.t
changeset 3559 d166b3dc5e8a
parent 3494 14cd04ff968e
child 3590 d5adce52cef4
child 3702 f6979d64b9fb 
--- a/tests/test-stabilize-conflict.t	Fri Mar 16 17:00:01 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Mon Mar 12 23:26:25 2018 -0700
@@ -65,8 +65,8 @@
   $ safesed 's/huit/eight/' babar
   $ hg diff
   diff -r 9d5daf8bd956 babar
-  --- a/babar	* (glob)
-  +++ b/babar	* (glob)
+  --- a/babar	Thu Jan 01 00:00:00 1970 +0000
+  +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
   @@ -5,6 +5,6 @@
    cinq
    six
evolve