Changeset 32573ff in mainline for contrib/bazaar/bzreml/__init__.py


Ignore:
Timestamp:
2016-05-02T20:58:16Z (8 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7c4b26c
Parents:
6adb775f (diff), 5035ba05 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline, which has dltest and fixes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/bazaar/bzreml/__init__.py

    r6adb775f r32573ff  
    208208                                        tree_ac.lock_read()
    209209                                        try:
    210                                                 diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None)
     210                                                diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None, 3)
    211211                                                diff.show_diff(None, None)
    212212                                        finally:
Note: See TracChangeset for help on using the changeset viewer.