Mercurial > evolve
diff tests/test-stabilize-result.t @ 517:0bc0c9edcb15 stable
evolve: usual syntax/grammar errors/long lines cleanup
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sat, 25 Aug 2012 09:45:03 +0200 |
| parents | 7ecd41520dae |
| children | 87c41ef95ebf |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Sat Aug 25 09:32:05 2012 +0200 +++ b/tests/test-stabilize-result.t Sat Aug 25 09:45:03 2012 +0200 @@ -99,7 +99,7 @@ Stabilize of late comer with different parent ================================================== -(the with same parent is handled in test-evolve.t) +(the same parent case is handled in test-evolve.t) $ glog @ 8:e3183e9c0961@default(draft) bk:[] newer a @@ -171,8 +171,8 @@ o 0:07f494440405@default(public) bk:[] adda -Stabilize of conflicting changeset with same parent -==================================================== +Stabilize conflicting changesets with same parent +================================================= $ rm a.orig $ hg up 9