Edward Thomson 35439f5997 win32: introduce p_timeval that isn't stupid ... Windows defines `timeval` with `long`, which we cannot sanely cope with. Instead, use a custom timeval struct.		2016-02-12 10:34:15 -08:00
..
trees	recursive merge: add a recursion limit	2015-11-25 16:25:47 -05:00
workdir	win32: introduce p_timeval that isn't stupid	2016-02-12 10:34:15 -08: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