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
..
analysis.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
dirty.c	win32: introduce p_timeval that isn't stupid	2016-02-12 10:34:15 -08:00
recursive.c	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
renames.c	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00
setup.c	merge: lock the index at the start of the merge	2015-02-14 09:25:35 -05:00
simple.c	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
submodules.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
trivial.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00