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
..
1d	Preserve tree filemode in index during checkout	2014-01-22 13:26:30 -05:00
1f	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
2b	Introduce failing test for conflict filtering in index	2014-10-13 13:36:16 -04:00
4a	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
4e	Introduce failing test for conflict filtering in index	2014-10-13 13:36:16 -04:00
5b	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
6b	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
6f	checkout test: ensure .gitattributes lifecycle	2015-02-02 22:46:39 -05:00
7b	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
9a	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
9b	tests: add merge-conflict branch for testrepo	2017-02-13 10:13:02 +01:00
9f	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
09	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
13	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
14	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
16	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
18	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
27	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
32	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
36	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
45	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
62	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
66	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
75	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
76	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
81	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
84	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
87	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
94	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
a3	tests: add merge-conflict branch for testrepo	2017-02-13 10:13:02 +01:00
a4	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
a6	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
a7	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
a8	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
ad	tests: add merge-conflict branch for testrepo	2017-02-13 10:13:02 +01:00
ae	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
af	Preserve tree filemode in index during checkout	2014-01-22 13:26:30 -05:00
b2	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
b6	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
be	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
c0	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
c3	checkout test: ensure .gitattributes lifecycle	2015-02-02 22:46:39 -05:00
c4	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
ce	Preserve tree filemode in index during checkout	2014-01-22 13:26:30 -05:00
cf	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
d4	Introduce failing test for conflict filtering in index	2014-10-13 13:36:16 -04:00
d5	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
d6	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
e3	checkout test: ensure .gitattributes lifecycle	2015-02-02 22:46:39 -05:00
e6	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
e7	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
ee	tests: use legitimate object ids	2016-02-28 18:54:56 -05:00
f1	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
f6	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
fa	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
fd	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
pack	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00