Edward Thomson b60149eced Tests merge when changes exist in workdir/index		2014-02-03 19:56:33 -08:00
..
trees	index: rename an entry's id to 'id'	2014-01-25 08:15:44 +01:00
workdir	Tests merge when changes exist in workdir/index	2014-02-03 19:56:33 -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