]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/history - t/conflicts.t
created
[git.ikiwiki.info.git] / t / conflicts.t
2019-02-03 Simon McVittiet: Consistently remove temp directory before testing...
2016-07-28 Simon McVittieExclude working directory from library path (CVE-2016...
2015-11-30 Simon McVittieMerge remote-tracking branch 'smcv/pagestats-show'
2015-11-30 Simon McVittieMerge remote-tracking branch 'smcv/ready/limit'
2015-11-30 Simon McVittieRun autopkgtest tests using autodep8 and the pkg-perl...
2015-03-01 Simon McVittieStandardize on --long-option instead of -long-option
2014-09-12 Simon McVittieikiwiki (3.20140916) unstable; urgency=low
2013-07-11 Joey Hessikiwiki (3.20130711) unstable; urgency=low
2010-08-27 Jonas SmedegaardMerge branch 'master' of git://git.ikiwiki.info
2010-07-18 Joey HessMerge remote branch 'intrigeri/po'
2010-07-18 Joey HessMerge branch 'master' of ssh://git.ikiwiki.info/srv...
2010-07-18 Joey Hessanother class of conflicts: subdir/file conflicts
2010-07-18 Joey Hess2 more cases
2010-07-18 Joey Hessavoid error if two source files render the same destina...
2010-07-18 Joey Hesssome other (similar) failure cases
2010-07-17 Joey Hessupdate
2010-07-17 Joey HessMerge branch 'master' of ssh://git.ikiwiki.info/srv...
2010-07-17 Joey Hessturning into complete source file conflict test suite