Fossil

Differences From Artifact [b18be8d536]:

• File test/merge_renames.test — part of check-in [89f76a21dd] at 2016-03-02 06:22:44 on branch testerCleanup — Work in progress on cleaning up home/repo handling in the test suite. (user: mistachkin size: 4131)

To Artifact [2e0c0e6f70]:

• File test/merge_renames.test — part of check-in [29f0328cd9] at 2016-03-02 06:45:21 on branch testerCleanup — More work... (user: mistachkin size: 4226)

201
202
203
204
205
206
207

######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
#  [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
#  [953031915f] - Lack of warning when overwriting extra files
#  [4df5f38f1e] - Troubles merging a file delete with a file change

>
>
>
>

201
202
203
204
205
206
207
208
209
210
211

######################################
#
# Tests for troubles not specifically linked with renames but that I'd like to
# write:
#  [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
#  [953031915f] - Lack of warning when overwriting extra files
#  [4df5f38f1e] - Troubles merging a file delete with a file change

###############################################################################

test_cleanup