p71924506
/
kernel_liteos_a1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
boxi 2021-04-22 16:44:46 +08:00
parent dc90400456
commit 35f7957975
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,8 +3,6 @@
*.a *.a
*.so *.so
*.swp *.swp
*.rej
*.orig
# IDE settings # IDE settings
.vscode .vscode