this file will be renamed
(differently) in both the
ours and the theirs branches

this file will be renamed
(differently) in both the
ours and the theirs branches

this file will be renamed
(differently) in both the
ours and the theirs branches

this file will be renamed
(differently) in both the
ours and the theirs branches

this file will be renamed
(differently) in both the
ours and the theirs branches

this file will be renamed
(differently) in both the
ours and the theirs branches
