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

..

trees

introduce git_index_entry_is_conflict

2015-05-28 09:47:31 -04:00

workdir

merge: work around write-side racy protection when hacking the index

2015-06-22 16:11:58 +02: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