package info (click to toggle)
lazygit 0.57.0%2Bds1-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 7,748 kB
  • sloc: sh: 153; makefile: 76

Folder: conflicts

d .. (parent)
- - rw-r--r-- 1,099 filter.go
- - rw-r--r-- 1,389 merge_file_both.go
- - rw-r--r-- 1,408 merge_file_current.go
- - rw-r--r-- 1,418 merge_file_incoming.go
- - rw-r--r-- 919 resolve_externally.go
- - rw-r--r-- 1,365 resolve_multiple_files.go
- - rw-r--r-- 2,100 resolve_no_auto_stage.go
- - rw-r--r-- 4,432 resolve_non_textual_conflicts.go
- - rw-r--r-- 1,535 resolve_without_trailing_lf.go
- - rw-r--r-- 1,256 undo_choose_hunk.go