Part of bzrlib.merge View In Hierarchy
Known subclasses: bzrlib.merge.PerFileMerger
See bzrlib.plugins.news_merge.news_merge for an example concrete class.
Instance Variables | merger | The Merge3Merger performing the merge. |
Method | __init__ | Create a PerFileMerger for use with merger. |
Method | merge_contents | Attempt to merge the contents of a single file. |
Parameters | merge_params | A bzrlib.merge.MergeHookParams |
Returns | A tuple of (status, chunks), where status is one of 'not_applicable', 'success', 'conflicted', or 'delete'. If status is 'success' or 'conflicted', then chunks should be an iterable of strings for the new file contents. |