* Update docs with a better mergemaster procedure and better markup.
Partially submitted by: ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>
* Make etcmerge show usage information when run with no arguments.
Noticed by: Daniel O'Connor <doconnor@gsoft.com.au>