Carlos Martín Nieto 5b05f95424 merge: work around write-side racy protection when hacking the index ... As we attempt to replicate a situation in which an older checkout has put a file on disk with different filtering settings from us, set the timestamp on the entry and file to a second before we're performing the operation so the entry in the index counts as old. This way we can test that we're not looking at the on-disk file when the index has the entry and we detect it as clean.		2015-06-22 16:11:58 +02:00
..
analysis.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
dirty.c	merge: work around write-side racy protection when hacking the index	2015-06-22 16:11:58 +02:00
renames.c	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
setup.c	merge: lock the index at the start of the merge	2015-02-14 09:25:35 -05:00
simple.c	reset: remove reflog message override	2015-03-03 14:40:50 +01: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