add import merging functionality, fix error handling in uci_import
[project/uci.git] / .gitignore
1 uci
2 *.[oa]
3 .*.swp
4 .gdb*