5 Commits

Author	SHA1	Message	Date
Edward Thomson	2d24816b46	checkout_index: Remove stage 0 when checking out conflicts	2014-11-06 18:50:10 -05:00
Edward Thomson	8d3b2ee3d7	Introduce failing test for conflict filtering in index	2014-10-13 13:36:16 -04:00
Ben Straub	6affd71f33	git_checkout_opts -> git_checkout_options	2014-03-06 09:44:51 -08:00
Carlos Martín Nieto	9950bb4e8d	diff: rename the file's 'oid' to 'id' ... In the same vein as the previous commits in this series.	2014-01-25 08:15:44 +01:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00