On Thu, 14 Oct 2010 14:59:47 -0700, Russell Jackson wrote: > > On 10/14/2010 02:56 PM, Markus Roberts wrote: > >Manually posting code from his branch in the ticket to the list for comment > >/ review. > > > > I'm not sure I merged the upstream 2.6.x branch correctly which is > why there's that weird empty commit. >
The merge commit looks normal to me. Without any conflicts in the merge, there wouldn't be a diff to show for the merge commit. -- Jacob Helwig
signature.asc
Description: Digital signature
