Difference between revisions of "Git diff --check"
Jump to navigation
Jump to search
Line 1: | Line 1: | ||
{{lc}} | {{lc}} | ||
+ | |||
+ | /path/locals.tf:2: [[leftover conflict marker]] | ||
+ | /path/locals.tf:14: leftover conflict marker | ||
+ | /path/locals.tf:28: leftover conflict marker | ||
[[CONFLICT]] | [[CONFLICT]] | ||
{{git diff}} | {{git diff}} |
Latest revision as of 12:53, 27 April 2023
/path/locals.tf:2: leftover conflict marker /path/locals.tf:14: leftover conflict marker /path/locals.tf:28: leftover conflict marker
CONFLICT
git diff
: [main | HEAD | --staged | --name-only | --stat | --cached
], --help
Advertising: