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

timlinux · timlinux · commit cf7b989a7e2c · 2011-11-12T13:39:03.000+02:00
diff --git a/scripts/remove_svn_conflict_files.sh b/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}')
+#
