kimura wataru
kimur****@i*****
Tue Aug 15 22:08:14 JST 2006
On Mon, 14 Aug 2006 23:40:00 +0200, Laurent Sansonetti wrote: > > On Aug 14, 2006, at 4:03 PM, kimura wataru wrote: >> I tested to merge apple-unstable into trunk with "svn merge --dry- >> run". >> >> I think these conflicts are not so complex, and I believe that we can >> solve them. I attached all of log on "svn merge". >> > > Thank you Kimura-san. I solved the conflicts on my working copy. Shall > I commit everything? > Nice! Please commit to trunk. -- kimura wataru
