diff options
| author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
|---|---|---|
| committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
| commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
| tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /.bk-to-hg | |
| parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
| parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
| download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip | |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to '.bk-to-hg')
| -rwxr-xr-x | .bk-to-hg | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -4,7 +4,5 @@ test -L old/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs rm old/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs test -L tools/domain_builder/dom0_ops.h rm tools/domain_builder/dom0_ops.h -test -L xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor-ifs -rm xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor-ifs (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 |