comparison tests/test-evolve-stop-orphan.t @ 3995:684cc3418ecd mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 21 Aug 2018 13:26:35 +0200
parents d00f0c369bc7 828b423545b1
children 21eab0a99841 e268f7fd7839
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3995:684cc3418ecd
167 | () draft 167 | () draft
168 o 0:8fa14d15e168 added hgignore 168 o 0:8fa14d15e168 added hgignore
169 () draft 169 () draft
170 170
171 $ hg status 171 $ hg status
172 $ ls .hg/
173 00changelog.i
174 branch
175 cache
176 dirstate
177 last-message.txt
178 requires
179 store
180 undo.backup.dirstate
181 undo.bookmarks
182 undo.branch
183 undo.desc
184 undo.dirstate
172 185
173 Checking when multiple revs need to be evolved, some revs evolve without 186 Checking when multiple revs need to be evolved, some revs evolve without
174 conflicts 187 conflicts
175 ========================================================================= 188 =========================================================================
176 189