Mercurial > hg

comparison tests/test-convert-svn-sink.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents 5af5f0f9d724
children 92ccccb55ba3
comparison
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707
256 adding b 256 adding b
257 adding left-1 257 adding left-1
258 adding left-2 258 adding left-2
259 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 259 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
260 adding right-1 260 adding right-1
261 created new head
261 adding right-2 262 adding right-2
262 3 files updated, 0 files merged, 2 files removed, 0 files unresolved 263 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
263 merging b 264 merging b
264 warning: conflicts during merge. 265 warning: conflicts during merge.
265 merging b failed! 266 merging b failed!