git merge java-overlay/master
Adding profiles/package.mask/gentoo.org
Adding profiles/package.mask/perl-experimental
Adding profiles/package.mask/regen2.org
Adding profiles/package.mask/sunrise
profiles/package.mask/java-overlay: unmerged
(f67eeb638e2593b2bee5c9b476e3044a8404916a)
fatal: git write-tree failed to write a tree
normally merges work fine... hmm...
--
Caleb Cushing
http://xenoterracide.blogspot.com