Edward Thomson 6891a862bb Load merge.conflictstyle setting from config		2014-01-20 17:15:13 -05:00
..
trees	merge_file should use more aggressive levels	2014-01-20 17:15:11 -05:00
workdir	Load merge.conflictstyle setting from config	2014-01-20 17:15:13 -05:00
merge_helpers.c	refs: remove the _with_log differentiation	2014-01-15 13:32:43 +01:00
merge_helpers.h	Bare naked merge and rebase	2013-12-03 10:18:53 -05:00