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
..
automerge.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
commits.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
modeconflict.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
renames.c	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
treediff.c	merge: merge iterators	2015-05-11 14:11:56 -04:00
trivial.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
whitespace.c	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00