6 Commits

Author	SHA1	Message	Date
Jongmin Kim	ac3d33df5d	New upstream version 0.28.1+dfsg.1	2019-05-12 00:29:21 +09:00
Pirate Praveen	eae0bfdcd8	New upstream version 0.27.0+dfsg.1	2018-04-26 18:06:07 +05:30
Patrick Steinhardt	8acc3b16ef	tests: add merge-conflict branch for testrepo ... Add a new branch that causes a merge conflict to `testrepo` so that we are able to test merging in worktrees.	2017-02-13 10:13:02 +01:00
Patrick Steinhardt	bd9f4fd24c	tests: add worktree test data	2017-02-13 10:13:02 +01:00
Edward Thomson	60561d5446	tests: update for new test data	2015-02-02 22:46:43 -05:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00