On Mon, Feb 14, 2011 at 11:26 AM, Ferry Huberts <mailings@xxxxxxxxx> wrote:
>
>
> On 02/14/2011 05:07 PM, Michael Meeks wrote:
>> Hi guys,
>>
>> We are having quite some fun merging git branches with LibreOffice, and
>> I stumbled over this just now with master git with hash:
>> 00e6ee724640701b32aca27cc930fd6409c87ae2
>>
[...]
>> yields:
>>
>> @@@ -147,11 -147,7 +147,15 @@@ SvToken & SvToken::operator = ( const S
>> *************************************************************************/
>> void SvTokenStream::InitCtor()
>> {
>> ++<<<<<<< HEAD
>> +#ifdef DOS
>> + SetCharSet( CHARSET_ANSI );
>> +#else
>> SetCharSet( gsl_getSystemTextEncoding() );
>> +#endif
>> ++=======
>> ++ SetCharSet( gsl_getSystemTextEncoding() );
>> ++>>>>>>> stage/premerge/dev300_m98
>
>
> this is the annotation of the conflict
The point is that there should not have been a conflict to start with.
git 1.7.3.4 agree that there is no conflict.
Norbert
>
> grtz
>
> --
> Ferry Huberts
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html