File tree Expand file tree Collapse file tree 1 file changed +1
-14
lines changed Expand file tree Collapse file tree 1 file changed +1
-14
lines changed Original file line number Diff line number Diff line change @@ -270,19 +270,6 @@ proc show_other_diff {path w m cont_info} {
270
270
}
271
271
}
272
272
273
- proc get_conflict_marker_size {path} {
274
- set size 7
275
- catch {
276
- set fd_rc [eval [list git_read check-attr " conflict-marker-size" -- $path ]]
277
- set ret [gets $fd_rc line]
278
- close $fd_rc
279
- if {$ret > 0} {
280
- regexp {.*: conflict-marker-size: (\d+)$} $line line size
281
- }
282
- }
283
- return $size
284
- }
285
-
286
273
proc start_show_diff {cont_info {add_opts {}}} {
287
274
global file_states file_lists
288
275
global is_3way_diff is_submodule_diff diff_active repo_config
@@ -298,7 +285,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
298
285
set is_submodule_diff 0
299
286
set diff_active 1
300
287
set current_diff_header {}
301
- set conflict_size [get_conflict_marker_size $path ]
288
+ set conflict_size [gitattr $path conflict-marker-size 7 ]
302
289
303
290
set cmd [list ]
304
291
if {$w eq $ui_index } {
You can’t perform that action at this time.
0 commit comments