1) Filter Table
Filter is default table for iptables. So, if you don’t define you own table, you’ll be using filter table. Iptables’s filter table has the following built-in chains.
1) Filter Table
Filter is default table for iptables. So, if you don’t define you own table, you’ll be using filter table. Iptables’s filter table has the following built-in chains.
Abort: outstanding uncommitted changes | |
$ hg update --clean -r tip | |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
$ hg merge | |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
(branch merge, don't forget to commit) | |
$ hg commit -m "cleaned and merged" |