[Koha-bugs] [Bug 9977] OMNIBUS, remove accidental 'merge marker' strings from Koha

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9977

Galen Charlton <gmcharlt at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |INVALID

--- Comment #2 from Galen Charlton <gmcharlt at gmail.com> ---
'<<<<' or '>>>>' isn't the pattern to look for.  What you want is '^<<<<<' and
'^>>>>>'.  Fortunately, there is already a test for this: 
t/00-merge-conflict-markers.t.

In principle, one could also look for '^=====', but there are a bunch of files
that do that legitimately (e.g., the release notes).

Since this issue is already handled, in other words, I'm marking this
resolved/invalid.

-- 
You are receiving this mail because:
You are watching all bug changes.