Part of bzrlib.merge View In Hierarchy
There are some fields hooks can access:
Instance Variables | file_id | the file ID of the file being merged |
trans_id | the transform ID for the merge of this file | |
this_kind | kind of file_id in 'this' tree | |
other_kind | kind of file_id in 'other' tree | |
winner | one of 'this', 'other', 'conflict' |
Method | __init__ | Undocumented |
Method | is_file_merge | True if this_kind and other_kind are both 'file'. |
Method | base_lines | The lines of the 'base' version of the file. |
Method | this_lines | The lines of the 'this' version of the file. |
Method | other_lines | The lines of the 'other' version of the file. |