boxi 35f7957975 fix: Show conflicting files for git apply or patch -p command ...

Modify the .gitignore file to display the conflicting files of git apply or patch -px.

Close #I3NNUS

Change-Id: I0ca0e312d0a83326e661d997181167e61b63e4b4

2021-04-22 16:44:46 +08:00

246 B

Raw Blame History

View Raw