Skip to content
Permalink
Browse files
Added another way to find org files (but commented out)
  • Loading branch information
timlinux committed Nov 12, 2011
1 parent b41472f commit cf7b989a7e2c787c7f9882175d36e7e7d0e22b36
Showing with 4 additions and 0 deletions.
  1. +4 −0 scripts/remove_svn_conflict_files.sh
@@ -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}')
#

0 comments on commit cf7b989

Please sign in to comment.