Mercurial > evolve
comparison tests/test-evolve-stop-orphan.t @ 4356:a71f2271ed76 mercurial-4.8
branching: merge with future version
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 10:46:02 -0500 |
| parents | 00bc03f56f37 |
| children | a2fdbece7ce1 63a816beee7e |
comparison
equal
deleted
inserted
replaced
| 4355:75db6a9d0b54 | 4356:a71f2271ed76 |
|---|---|
| 107 cb6a2ab625bb tip | 107 cb6a2ab625bb tip |
| 108 | 108 |
| 109 Checking working dir | 109 Checking working dir |
| 110 $ hg status | 110 $ hg status |
| 111 Checking for incomplete mergestate | 111 Checking for incomplete mergestate |
| 112 $ ls .hg/merge | 112 $ ls .hg/ | grep merge |
| 113 ls: cannot access .?\.hg/merge.?: No such file or directory (re) | 113 [1] |
| 114 [2] | |
| 115 | 114 |
| 116 Checking graph | 115 Checking graph |
| 117 $ hg glog | 116 $ hg glog |
| 118 @ 5:cb6a2ab625bb added c | 117 @ 5:cb6a2ab625bb added c |
| 119 | () draft | 118 | () draft |