Differ's merge_text's body result now is a single string instead of an...

... array. Also add a 'include_base' option that, if set to false, will exclude the base in conflicts