view tests/test-merge4.out @ 8709:b9e0ddb04c5c

commit: move explicit file checking into repo.commit
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Jun 2009 21:51:00 -0500
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)