sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-04 00:04:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added another way to find org files (but commented out)

Browse Source
This commit is contained in:
Tim Sutton 2011-11-12 13:39:03 +02:00
parent b41472fd84
commit cf7b989a7e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/remove_svn_conflict_files.sh
View File

@ -10,3 +10,7 @@
for FILE in `find . -name *.orig`; do echo "Deleting reject: $FILE"; rm -i $FILE; done
for FILE in `find . -name *.rej`; do echo "Deleting reject: $FILE"; rm -i $FILE; done
for FILE in `find . -name *.tmp | grep -v "\.svn"`; do echo "Deleting reject: $FILE"; rm -i $FILE; done
#rm $(git status | grep orig | awk '{print $2}')
#rm $(git status | grep LOCAL | awk '{print $2}')
#rm $(git status | grep REMOTE | awk '{print $2}')
#