Edward Thomson d953c4505e merge drivers: handle configured but not found driver

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

..

trees

recursive merge: add a recursion limit

2015-11-25 16:25:47 -05:00

workdir

Fix rebase bug and include test for merge=union

2016-03-17 11:02:26 -04:00

conflict_data.h

merge: handle conflicts in recursive base building

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

driver.c

merge drivers: handle configured but not found driver

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

files.c

merge tests: move expected data into own file

2015-11-25 15:38:22 -05: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