Skip to content

Latest commit

 

History

History
6 lines (5 loc) · 178 Bytes

open_all_files_with_conflicts_at_once.md

File metadata and controls

6 lines (5 loc) · 178 Bytes

Open all files with conflicts at once

git diff --name-only --diff-filter=U | uniq  | xargs $EDITOR

—-diff-filter=U filters out all the files without conflicts.