Edward Thomson 6abdf52d6e merge::workdir::dirty: update to use st_ctime_nsec ... Update unit test to use newfangled `st_ctime_nsec`, which provides indirection to the platform-correct name.		2016-03-07 09:37:51 -05:00
..
trees	recursive merge: add a recursion limit	2015-11-25 16:25:47 -05:00
workdir	merge::workdir::dirty: update to use st_ctime_nsec	2016-03-07 09:37:51 -05:00
conflict_data.h	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
files.c	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
merge_helpers.c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
merge_helpers.h	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00