@@ -1142,17 +1142,13 @@ def get_hello_txt_from_repo() -> str:
11421142 return blob .data .decode ()
11431143
11441144 # no change
1145- res = testrepo .merge_file_from_index (
1146- hello_txt , hello_txt , hello_txt
1147- )
1145+ res = testrepo .merge_file_from_index (hello_txt , hello_txt , hello_txt )
11481146 assert res == MergeFileResult (
11491147 True , hello_txt .path , hello_txt .mode , get_hello_txt_from_repo ()
11501148 )
11511149
11521150 # executable switch on ours
1153- res = testrepo .merge_file_from_index (
1154- hello_txt , hello_txt_executable , hello_txt
1155- )
1151+ res = testrepo .merge_file_from_index (hello_txt , hello_txt_executable , hello_txt )
11561152 assert res == MergeFileResult (
11571153 True ,
11581154 hello_txt .path ,
@@ -1161,9 +1157,7 @@ def get_hello_txt_from_repo() -> str:
11611157 )
11621158
11631159 # executable switch on theirs
1164- res = testrepo .merge_file_from_index (
1165- hello_txt , hello_txt , hello_txt_executable
1166- )
1160+ res = testrepo .merge_file_from_index (hello_txt , hello_txt , hello_txt_executable )
11671161 assert res == MergeFileResult (
11681162 True ,
11691163 hello_txt .path ,
@@ -1183,31 +1177,23 @@ def get_hello_txt_from_repo() -> str:
11831177 )
11841178
11851179 # path switch on ours
1186- res = testrepo .merge_file_from_index (
1187- hello_txt , hello_world , hello_txt
1188- )
1180+ res = testrepo .merge_file_from_index (hello_txt , hello_world , hello_txt )
11891181 assert res == MergeFileResult (
11901182 True , hello_world .path , hello_txt .mode , get_hello_txt_from_repo ()
11911183 )
11921184
11931185 # path switch on theirs
1194- res = testrepo .merge_file_from_index (
1195- hello_txt , hello_txt , hello_world
1196- )
1186+ res = testrepo .merge_file_from_index (hello_txt , hello_txt , hello_world )
11971187 assert res == MergeFileResult (
11981188 True , hello_world .path , hello_txt .mode , get_hello_txt_from_repo ()
11991189 )
12001190
12011191 # path switch on both
1202- res = testrepo .merge_file_from_index (
1203- hello_txt , hello_world , hello_world
1204- )
1192+ res = testrepo .merge_file_from_index (hello_txt , hello_world , hello_world )
12051193 assert res == MergeFileResult (True , None , hello_txt .mode , get_hello_txt_from_repo ())
12061194
12071195 # path switch on ours, executable flag switch on theirs
1208- res = testrepo .merge_file_from_index (
1209- hello_txt , hello_world , hello_txt_executable
1210- )
1196+ res = testrepo .merge_file_from_index (hello_txt , hello_world , hello_txt_executable )
12111197 assert res == MergeFileResult (
12121198 True ,
12131199 hello_world .path ,
@@ -1216,9 +1202,7 @@ def get_hello_txt_from_repo() -> str:
12161202 )
12171203
12181204 # path switch on theirs, executable flag switch on ours
1219- res = testrepo .merge_file_from_index (
1220- hello_txt , hello_txt_executable , hello_world
1221- )
1205+ res = testrepo .merge_file_from_index (hello_txt , hello_txt_executable , hello_world )
12221206 assert res == MergeFileResult (
12231207 True ,
12241208 hello_world .path ,
0 commit comments