Edward Thomson b8823c2b1c Add failing test case for virtual commit merge base issue

2018-02-04 10:29:41 +00:00

..

trees

Add failing test case for virtual commit merge base issue

2018-02-04 10:29:41 +00:00

workdir

merge: reverse merge bases for recursive merge

2018-02-04 10:29:41 +00:00

conflict_data.h

merge: reverse merge bases for recursive merge

2018-02-04 10:29:41 +00:00

driver.c

merge drivers: handle configured but not found driver

2016-03-17 11:06:00 -04:00

files.c

merge: test CR/LF conflicts for CR/LF files

2018-01-21 12:28:13 +00:00

merge_helpers.c

merge: add simple recursive test

2015-11-25 15:37:11 -05:00

merge_helpers.h

merge tests: move expected data into own file

2015-11-25 15:38:22 -05:00