126
127
128
129
130
131
132
|
######################################
# Test 3 #
# Reported: Ticket [30b28cf351] #
######################################
# TO BE WRITTEN.
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
######################################
# Test 3 #
# Reported: Ticket [30b28cf351] #
######################################
# TO BE WRITTEN.
######################################
# Test 4 #
# Reported: Ticket [67176c3aa4] #
######################################
# TO BE WRITTEN.
# 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
|