Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-add.out @ 5464:7dafd9ab3979

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: colorize commits by authors Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
author Georg.Koltermann@mscsoftware.com
date Thu, 12 Apr 2007 13:11:30 +0200
parents 212de429e000
children
line wrap: on
line source

adding a
? a
adding a
A a
A a
? b
A a
A b
% should fail
b already tracked!
A a
A b
% should fail
a already tracked!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
M a
% should fail
a already tracked!
M a
% issue683
R a
M a