git.vanrenterghem.biz Git - git.ikiwiki.info.git/history - t/conflicts.t

]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/history - t/conflicts.t

projects / git.ikiwiki.info.git / history

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

[git.ikiwiki.info.git] / t / conflicts.t

2016-01-21	Simon McVittie	Merge branch 'master' into debian-jessie-backports	blob \| commitdiff \| raw
2015-11-30	Simon McVittie	Merge remote-tracking branch 'smcv/pagestats-show'	blob \| commitdiff \| raw
2015-11-30	Simon McVittie	Merge remote-tracking branch 'smcv/ready/limit'	blob \| commitdiff \| raw
2015-11-30	Simon McVittie	Run autopkgtest tests using autodep8 and the pkg-perl...	blob \| commitdiff \| raw
2015-03-01	Simon McVittie	Standardize on --long-option instead of -long-option	blob \| commitdiff \| raw \| diff to current
2014-09-12	Simon McVittie	ikiwiki (3.20140916) unstable; urgency=low	blob \| commitdiff \| raw \| diff to current
2013-07-11	Joey Hess	ikiwiki (3.20130711) unstable; urgency=low	blob \| commitdiff \| raw \| diff to current
2010-08-27	Jonas Smedegaard	Merge branch 'master' of git://git.ikiwiki.info	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	Merge remote branch 'intrigeri/po'	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	Merge branch 'master' of ssh://git.ikiwiki.info/srv...	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	another class of conflicts: subdir/file conflicts	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	2 more cases	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	avoid error if two source files render the same destina...	blob \| commitdiff \| raw \| diff to current
2010-07-18	Joey Hess	some other (similar) failure cases	blob \| commitdiff \| raw \| diff to current
2010-07-17	Joey Hess	update	blob \| commitdiff \| raw \| diff to current
2010-07-17	Joey Hess	Merge branch 'master' of ssh://git.ikiwiki.info/srv...	blob \| commitdiff \| raw \| diff to current
2010-07-17	Joey Hess	turning into complete source file conflict test suite	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.