##// 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.
Martin Geisler - - Load All Authors

File last commit:

r8167:6c82beaa default
r12277:a7d3147b stable
Show More
test-rename-dir-merge
33 lines | 383 B | text/plain | TextLexer
/ tests / test-rename-dir-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
mkdir t
cd t
hg init
mkdir a
echo foo > a/a
echo bar > a/b
hg ci -Am "0"
hg co -C 0
hg mv a b
hg ci -m "1 mv a/ b/"
hg co -C 0
echo baz > a/c
echo quux > a/d
hg add a/c
hg ci -m "2 add a/c"
hg merge --debug 1
echo a/* b/*
hg st -C
hg ci -m "3 merge 2+1"
hg debugrename b/c
hg co -C 1
hg merge --debug 2
echo a/* b/*
hg st -C
hg ci -m "4 merge 1+2"
hg debugrename b/c