libgit2/tests/merge
Carlos Martín Nieto 75a0ccf52f Merge pull request #3170 from CmdrMoozy/nsec_fix
git_index_entry__init_from_stat: set nsec fields in entry stats
2015-11-12 19:53:09 +01:00
..
trees merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT 2015-10-22 14:55:17 -04:00
workdir cmake: Only provide USE_NSEC if struct stat members are avilable. 2015-09-18 23:33:56 -07:00
files.c diff: don't feed large files to xdiff 2015-10-05 22:59:50 +02:00
merge_helpers.c merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT 2015-10-22 14:55:17 -04:00
merge_helpers.h Factor 40 and 41 constants from source. 2014-09-16 13:07:04 +02:00