~coreygoldberg/uci-engine/subunit-results

« back to all changes in this revision

Viewing changes to cupstream2distro/tests/data/branches/oneupstreamchange/bzr/branch/branch.conf

Merge trunk, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
gtk_global_commit_message = """add a new change
 
2
******
 
3
autobackport of a daily snapshot for releasing 42.0daily83.09.13.1-0ubuntu1"""
 
4
gtk_file_commit_messages = de