Hi Albert, On Thu, May 30, 2013 at 9:21 AM, Albert ARIBAUD <albert.u.b...@aribaud.net>wrote:
> On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD > <albert.u.b...@aribaud.net> wrote: > > > Hello Tom and Bo, > > > > While preparing for my ARM PR, I have encountered two merge conflicts. > > Their resolution can be found in branch 'merge_from_mainline' of ARM > > repo git://git.denx.de/u-boot-arm. > > > > For common/cmd_fpga.c, the merge conflict was trivial -- Simon's > > renaming fit somehow caused a need for manual resolution just to > > select the version with the right name. Simon, can you confirm that my > > resolution is correct? > > ... actually adding Simon as To:... > Yes this looks right thanks. Although I do wonder if you mean that I renamed 'fit', or I had a renaming fit. Regards, Simon
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
