git.koha-community.org Git - koha.git/history - t/00-merge-conflict-markers.t

[koha.git] / t / 00-merge-conflict-markers.t

2012-01-06	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_6530'	blob \| commitdiff \| raw
2012-01-06	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_6328'	blob \| commitdiff \| raw
2011-12-08	Paul Poulain	Merge remote-tracking branch 'origin/master' into new...	blob \| commitdiff \| raw
2011-12-07	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_5604'	blob \| commitdiff \| raw
2011-12-07	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_6291'	blob \| commitdiff \| raw
2011-12-07	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_6971'	blob \| commitdiff \| raw
2011-12-07	Paul Poulain	Test suite: ignoring backups from vi (files ending...	blob \| commitdiff \| raw
2011-12-06	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_5604'	blob \| commitdiff \| raw \| diff to current
2011-12-03	Paul Poulain	Merge remote-tracking branch 'origin/new/bug_6966'	blob \| commitdiff \| raw \| diff to current
2011-11-24	Paul Poulain	Merge branch 'new/enh/bug_4877'	blob \| commitdiff \| raw \| diff to current
2011-11-18	Chris Nighswonger	Bug 7095: Fixing cut and paste error and removing the...	blob \| commitdiff \| raw \| diff to current
2011-03-21	Chris Cormack	Merge remote branch 'kc/master' into new/enh/bug_5917	blob \| commitdiff \| raw \| diff to current
2011-02-07	Chris Cormack	Merge branch 'new/bug_5277' into kcmaster	blob \| commitdiff \| raw \| diff to current
2010-12-13	Chris Cormack	Merge remote branch 'kc/new/biblibre_reports' into...	blob \| commitdiff \| raw \| diff to current
2010-11-13	Chris Cormack	Merge remote branch 'kc/new/bug_4498' into kcmaster	blob \| commitdiff \| raw \| diff to current
2010-11-13	Galen Charlton	bug 5400: new test case to find files with merge confli...	blob \| commitdiff \| raw \| diff to current

Main Koha release repository

RSS Atom