Am Sonntag, 3. August 2014, 11:14:47 schrieb Yves Blusseau:
> Le 2 août 2014 à 19:02, Yves Blusseau a écrit :
> > Hi all,
> >
> > it's seems that commits from maint has not be fully merge into master:
> >
> > Performing inexact rename detection: 100% (14352/14352), done.
> > Auto-merging repo/li
Le 2 août 2014 à 19:02, Yves Blusseau a écrit :
> Hi all,
>
> it's seems that commits from maint has not be fully merge into master:
>
> Performing inexact rename detection: 100% (14352/14352), done.
> Auto-merging repo/linux/buildtool.cfg
> CONFLICT (content): Merge conflict in repo/linux/bui
Hi all,
it's seems that commits from maint has not be fully merge into master:
Performing inexact rename detection: 100% (14352/14352), done.
Auto-merging repo/linux/buildtool.cfg
CONFLICT (content): Merge conflict in repo/linux/buildtool.cfg
CONFLICT (rename/delete): repo/linux/Bering-3.4.101.co
