Jacques Germishuys 0f24cac2b9 Added tests to merge files and branches with whitespace problems and fixes		2015-03-16 09:53:27 +02:00
..
trees	Added tests to merge files and branches with whitespace problems and fixes	2015-03-16 09:53:27 +02:00
workdir	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
files.c	Added tests to merge files and branches with whitespace problems and fixes	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