From: Jason McMullan <mcmullan@netapp.com>
Date: Wed, 5 Dec 2007 17:16:56 +0000 (-0500)
Subject: Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import
X-Git-Tag: v1.5.5-rc0~267
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f3e9512be1c7935b8ca496f3687c6850b32a06f3?ds=inline;hp=f3e9512be1c7935b8ca496f3687c6850b32a06f3

Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import

This patch removes the '$Keyword: ...$' '...' data, so that files
don't have spurious megre conflicts between branches.

Handles both +ko and +k styles, and leaves the '$Foo$' in
the original file.

Signed-off-by: Simon Hausmann <simon@lst.de>
---