]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 26d79ec) | patch
Test suite: ignoring backups from vi (files ending with a ~)
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 7 Dec 2011 14:17:54 +0000 (15:17 +0100)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Wed, 7 Dec 2011 16:33:43 +0000 (11:33 -0500)
commit03f6e33c4b331cf0daeab4fe8f402173146b1f67
tree864c58234a1ff31b6c6e5969ea64cdb98a988814tree | snapshot
parent26d79ec4f2ea5fb16d41b9ac89af2f663238c08ccommit | diff
Test suite: ignoring backups from vi (files ending with a ~)

On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed!
ignoring any file ending with a ~
(cherry picked from commit 13f29dd7f36137a77695af6c6eb3032ec72d9ae2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
t/00-merge-conflict-markers.t diff | blob | history
Main Koha release repository