tests/test-rebase-conflicts.t
changeset 35384 b9bdee046cc2
parent 34865 a0100f34e20b
child 35393 4441705b7111
equal deleted inserted replaced
35383:82c3762349ac 35384:b9bdee046cc2
   233      date:        Tue Sep 03 13:55:08 2013 -0400
   233      date:        Tue Sep 03 13:55:08 2013 -0400
   234      summary:     added default.txt
   234      summary:     added default.txt
   235   
   235   
   236   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
   236   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
   237   rebase onto 4bc80088dc6b starting from e31216eec445
   237   rebase onto 4bc80088dc6b starting from e31216eec445
       
   238   rebasing on disk
   238   rebase status stored
   239   rebase status stored
   239   rebasing 9:e31216eec445 "more changes to f1"
   240   rebasing 9:e31216eec445 "more changes to f1"
   240    future parents are 2 and -1
   241    future parents are 2 and -1
   241   rebase status stored
   242   rebase status stored
   242    update to 2:4bc80088dc6b
   243    update to 2:4bc80088dc6b