Mercurial > hg

view tests/test-rebase-newancestor.out @ 11346:e740f36cfb4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rename test-merge3 to test-add-remove. It tests that 'hg commit' does not crash if the user removes a newly added file, which has nothing to do with merging.
author Greg Ward <greg-hg@gerg.ca>
date Mon, 14 Jun 2010 13:39:00 -0400
parents 49efeed49c94
children
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  3:AD 1d4e82ed3c2a
|
| o  2:C 7e1afe9214b2
| |
| o  1:B 0a6620c3c26a
|/
o  0:A 1e635d440a73

@  3:C 0c5887756284
|
o  2:B 4f208f4a1507
|
o  1:AD 1d4e82ed3c2a
|
o  0:A 1e635d440a73