delta/libgit2.git/tests/merge/workdir, branch cmn/https-cap-no-hardcode

Fix rebase bug and include test for merge=union

2016-03-17T15:02:26+00:00

merge::workdir::dirty: update to use `st_ctime_nsec`

2016-03-07T14:37:51+00:00

Update unit test to use newfangled `st_ctime_nsec`, which provides
indirection to the platform-correct name.

win32: introduce p_timeval that isn't stupid

2016-02-12T18:34:15+00:00

Windows defines `timeval` with `long`, which we cannot
sanely cope with.  Instead, use a custom timeval struct.

merge tests: correct casts

2016-02-11T19:41:23+00:00

merge: handle conflicts in recursive base building

2015-11-25T20:38:39+00:00

When building a recursive merge base, allow conflicts to occur.
Use the file (with conflict markers) as the common ancestor.

The user has already seen and dealt with this conflict by virtue
of having a criss-cross merge.  If they resolved this conflict
identically in both branches, then there will be no conflict in the
result.  This is the best case scenario.

If they did not resolve the conflict identically in the two branches,
then we will generate a new conflict.  If the user is simply using
standard conflict output then the results will be fairly sensible.
But if the user is using a mergetool or using diff3 output, then the
common ancestor will be a conflict file (itself with diff3 output,
haha!).  This is quite terrible, but it matches git's behavior.

recursive: test conflict output during recursive merge

2015-11-25T20:38:28+00:00

merge tests: move expected data into own file

2015-11-25T20:38:22+00:00

merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`

2015-11-25T20:37:05+00:00

cmake: Only provide USE_NSEC if struct stat members are avilable.

2015-09-19T06:33:56+00:00

This allows us to remove OS checks from source code, instead relying
on CMake to detect whether or not `struct stat` has the nanoseconds
members we rely on.

cmake: add USE_NSEC, and only check nanosec m/ctime if enabled

2015-09-19T06:33:55+00:00