K 10
svn:author
V 6
eivind
K 8
svn:date
V 27
2004-01-21T15:10:35.000000Z
K 7
svn:log
V 283
Update to version 0.4:
* 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>

END