tests/test-stabilize-conflict.t
branchmercurial-4.2
changeset 3592 7a5c3175015e
parent 3591 98941c28f3e2
parent 3419 1e2f683e11e7
equal deleted inserted replaced
3591:98941c28f3e2 3592:7a5c3175015e
    63   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    63   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    64   [1] babar count up to ten
    64   [1] babar count up to ten
    65   $ safesed 's/huit/eight/' babar
    65   $ safesed 's/huit/eight/' babar
    66   $ hg diff
    66   $ hg diff
    67   diff -r 9d5daf8bd956 babar
    67   diff -r 9d5daf8bd956 babar
    68   --- a/babar	Thu Jan 01 00:00:00 1970 +0000
    68   --- a/babar	* (glob)
    69   +++ b/babar	Thu Jan 01 00:00:00 1970 +0000
    69   +++ b/babar	* (glob)
    70   @@ -5,6 +5,6 @@
    70   @@ -5,6 +5,6 @@
    71    cinq
    71    cinq
    72    six
    72    six
    73    sept
    73    sept
    74   -huit
    74   -huit
   150   | |
   150   | |
   151   | x  changeset:   4:5977072d13c5
   151   | x  changeset:   4:5977072d13c5
   152   |/   parent:      0:29ec1554cfaf
   152   |/   parent:      0:29ec1554cfaf
   153   |    user:        test
   153   |    user:        test
   154   |    date:        Thu Jan 01 00:00:00 1970 +0000
   154   |    date:        Thu Jan 01 00:00:00 1970 +0000
   155   |    obsolete:    amended as e04690b09bc6
       
   156   |    summary:     babar count up to ten
   155   |    summary:     babar count up to ten
   157   |
   156   |
   158   o  changeset:   0:29ec1554cfaf
   157   o  changeset:   0:29ec1554cfaf
   159      user:        test
   158      user:        test
   160      date:        Thu Jan 01 00:00:00 1970 +0000
   159      date:        Thu Jan 01 00:00:00 1970 +0000
   244   | |
   243   | |
   245   | x  changeset:   7:e04690b09bc6
   244   | x  changeset:   7:e04690b09bc6
   246   |/   parent:      0:29ec1554cfaf
   245   |/   parent:      0:29ec1554cfaf
   247   |    user:        test
   246   |    user:        test
   248   |    date:        Thu Jan 01 00:00:00 1970 +0000
   247   |    date:        Thu Jan 01 00:00:00 1970 +0000
   249   |    obsolete:    amended as b20d08eea373
       
   250   |    summary:     babar count up to ten
   248   |    summary:     babar count up to ten
   251   |
   249   |
   252   o  changeset:   0:29ec1554cfaf
   250   o  changeset:   0:29ec1554cfaf
   253      user:        test
   251      user:        test
   254      date:        Thu Jan 01 00:00:00 1970 +0000
   252      date:        Thu Jan 01 00:00:00 1970 +0000