]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fed973) | patch
bug 5400: new test case to find files with merge conflict markers
authorGalen Charlton <gmcharlt@gmail.com>
Sat, 13 Nov 2010 14:36:15 +0000 (09:36 -0500)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Sat, 13 Nov 2010 23:10:51 +0000 (18:10 -0500)
commit8dc027db127e82b1230d7240fb1f24a92231c253
tree7130b2159be17c7dbcbbcb0bee55a597ac05980atree | snapshot
parent4fed97397a3986fbba4a5cddaf3bfaa38eb870cdcommit | diff
bug 5400: new test case to find files with merge conflict markers

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
t/00-merge-conflict-markers.t [new file with mode: 0644] blob
Main Koha release repository