##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

color: add win32 support for non-black background...
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.
Adrian Buehlmann - - Load All Authors

File last commit:

r9611:a3d73b3e default
r12277:a7d3147b stable
Show More
test-merge8.out
10 lines | 345 B | text/plain | TextLexer
/ tests / test-merge8.out
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
hg.clone: report branch name on update
 r9611 updating to branch default
Thomas Arendsen Hein
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)...
 r3389 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
Matt Mackall
merge: fix spurious merges for copies in linear updates...
 r4416 1 files updated, 0 files merged, 1 files removed, 0 files unresolved