diff for duplicates of <4D2E0F32.8020602@netfilter.org> diff --git a/a/1.txt b/N1/1.txt index c258820..c016ef6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ On 06/01/11 07:15, Simon Horman wrote: I'm hitting some conflicts when pulling from your tree. -From git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 +>From git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6 * branch master -> FETCH_HEAD Auto-merging include/linux/netfilter.h Auto-merging include/linux/skbuff.h diff --git a/a/content_digest b/N1/content_digest index 47c22c2..586b39a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -22,7 +22,7 @@ "\n" "I'm hitting some conflicts when pulling from your tree.\n" "\n" - "From git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6\n" + ">From git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6\n" " * branch master -> FETCH_HEAD\n" "Auto-merging include/linux/netfilter.h\n" "Auto-merging include/linux/skbuff.h\n" @@ -34,4 +34,4 @@ "Auto-merging net/netfilter/ipvs/ip_vs_ctl.c\n" CONFLICT (content): Merge conflict in net/netfilter/ipvs/ip_vs_ctl.c -5e85cc83c8c1ddb970eaa959802ddd18e8e677098f3521006cfa6c4986502653 +221d8f091dba6a4d7b7e12f9c1f6c24be46b71cb207d60cf06d0c73c41fe0929
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.