Ben Straub a2ce19ca68 Prevent user's merge.conflictstyle from breaking tests		2014-02-05 13:35:26 -08:00
..
trees	index: rename an entry's id to 'id'	2014-01-25 08:15:44 +01:00
workdir	Prevent user's merge.conflictstyle from breaking tests	2014-02-05 13:35:26 -08:00
merge_helpers.c	index: rename an entry's id to 'id'	2014-01-25 08:15:44 +01:00
merge_helpers.h	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00