Hi,
When I run star-merge, I found a line started with ?M.
What does `?M' stand for?
I put the output here:
* build reference tree for [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-48
* from pristine cache: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-10
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-11
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-12
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-13
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-14
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-15
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-16
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-17
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-18
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-19
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-20
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-21
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-22
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-23
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-24
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-25
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-26
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-27
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-28
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-29
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-30
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-31
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-32
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-33
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-34
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-35
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-36
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-37
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-38
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-39
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-40
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-41
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-42
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-43
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-44
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-45
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-46
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-47
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-48
* star-merge by delta([EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-47,[EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-48)[/home/jet/typehack/freetype2]
* build reference tree for [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-47
* from pristine cache: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-10
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-11
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-12
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-13
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-14
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-15
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-16
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-17
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-18
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-19
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-20
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-21
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-22
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-23
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-24
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-25
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-26
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-27
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-28
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-29
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-30
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-31
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-32
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-33
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-34
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-35
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-36
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-37
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-38
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-39
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-40
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-41
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-42
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-43
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-44
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-45
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-46
* patching for revision: [EMAIL
PROTECTED]/freetype2--official-maintrunk--0.1--patch-47
* applying changeset
=> ./src/pcf/.arch-ids/readme.id src/pcf/.arch-ids/README.id
=> ./src/pcf/readme src/pcf/README
A
{arch}/freetype2/freetype2--official-maintrunk/freetype2--official-maintrunk--0.1/[EMAIL
PROTECTED]/patch-log/patch-48
M ChangeLog
M builds/amiga/README
?M builds/amiga/include/freetype/config/ftconfig.h
M builds/amiga/include/freetype/config/ftmodule.h
M builds/amiga/makefile
M builds/amiga/makefile.os4
M builds/amiga/smakefile
M builds/amiga/src/base/ftdebug.c
M builds/amiga/src/base/ftsystem.c
M include/freetype/config/ftoption.h
M include/freetype/freetype.h
M src/base/ftobjs.c
-- src/pcf/README
_______________________________________________
Gnu-arch-users mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnu-arch-users
GNU arch home page:
http://savannah.gnu.org/projects/gnu-arch/
