Alan Chandler wrote:
quoted text
> On Friday 01 December 2006 07:06, Wink Saville wrote:
> 
> Take a look in these two files - you should see conflict markers of the form
> <<<<<<<<<<<<<<<< 
> some content
> ================
> some other content
> 

That's what I thought but there isn't any "<<<<<" and git-diff also seems
to indicate no differences:

wink@winkc2d1:~/linux/linux-2.6$ git-diff kernel/fork.c
diff --cc kernel/fork.c
index d74b4a5,8cdd3e7..0000000
--- a/kernel/fork.c
+++ b/kernel/fork.c
wink@winkc2d1:~/linux/linux-2.6$


wink@winkc2d1:~/linux/linux-2.6$ git-diff kernel/spinlock.c
diff --cc kernel/spinlock.c
index f4d1718,2c6c2bf..0000000
--- a/kernel/spinlock.c
+++ b/kernel/spinlock.c
wink@winkc2d1:~/linux/linux-2.6$

Thanks,

Wink
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html