projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 924ce36) | 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)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 7 Dec 2011 14:17:54 +0000 (15:17 +0100)
commit13f29dd7f36137a77695af6c6eb3032ec72d9ae2
tree25f1de80bd61f24242f78890cfa1658295f406b5tree | snapshot
parent924ce3697dc97767f8d2261552da336afb1552eecommit | 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 ~
t/00-merge-conflict-markers.t diff | blob | history
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git