ignoring *.orig files from mercurial merges

.gitignore

@@ -12,6 +12,7 @@ local.properties
 *.o
 *.so
 *.a
+*.orig
 
 !jni/LuaJIT-2.0.1/android/armeabi/libluajit.a
 !jni/LuaJIT-2.0.1/android/armeabi-v7a/libluajit.a