Edward Thomson 9f545b9d71 introduce git_index_entry_is_conflict ... It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.		2015-05-28 09:47:31 -04:00
..
trees	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
workdir	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
files.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00
merge_helpers.c	Remove the signature from ref-modifying functions	2015-03-03 14:40:50 +01:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00