Re: [PATCH] ARM: EXYNOS4: Fix the merge conflict

[Junio C Hamano]

Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:

> On Fri, Nov 4, 2011 at 7:08 PM, Kukjin Kim <kgene.kim@xxxxxxxxxxx> wrote:
>> The mark of conflict should be removed.

Would the hooks/pre-commit.sample have helped? The "git diff --check" at
the last step would have caught this with modern versions of git.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/