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

qgis · Nov 12, 2011 · cf7b989 · cf7b989
1 parent b41472f
commit cf7b989
Showing 1 changed file with 4 additions and 0 deletions.
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}')
+#