tests/test-stabilize-conflict.t
branchmercurial-4.0
changeset 3110 50be10c63825
parent 3108 9c9c8c1eeb93
parent 3003 ddf28837f5af
child 3119 088ea9b74e47
equal deleted inserted replaced
3109:3024ae293732 3110:50be10c63825
   143   |  summary:     babar count up to ten
   143   |  summary:     babar count up to ten
   144   |
   144   |
   145   | o  changeset:   5:71c18f70c34f
   145   | o  changeset:   5:71c18f70c34f
   146   | |  user:        test
   146   | |  user:        test
   147   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   147   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   148   | |  trouble:     unstable
       
   149   | |  summary:     babar count up to fifteen
   148   | |  summary:     babar count up to fifteen
   150   | |
   149   | |
   151   | x  changeset:   4:5977072d13c5
   150   | x  changeset:   4:5977072d13c5
   152   |/   parent:      0:29ec1554cfaf
   151   |/   parent:      0:29ec1554cfaf
   153   |    user:        test
   152   |    user:        test
   234   |  summary:     babar count up to ten
   233   |  summary:     babar count up to ten
   235   |
   234   |
   236   | o  changeset:   8:1836b91c6c1d
   235   | o  changeset:   8:1836b91c6c1d
   237   | |  user:        test
   236   | |  user:        test
   238   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   237   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   239   | |  trouble:     unstable
       
   240   | |  summary:     babar count up to fifteen
   238   | |  summary:     babar count up to fifteen
   241   | |
   239   | |
   242   | x  changeset:   7:e04690b09bc6
   240   | x  changeset:   7:e04690b09bc6
   243   |/   parent:      0:29ec1554cfaf
   241   |/   parent:      0:29ec1554cfaf
   244   |    user:        test
   242   |    user:        test