Eivind Eklund cf5450acfb 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>		2004-01-21 15:10:35 +00:00
..
etcmerge.8	Update to version 0.4:	2004-01-21 15:10:35 +00:00
etcmerge.sh	Update to version 0.4:	2004-01-21 15:10:35 +00:00