mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-06 11:41:52 +00:00
cf5450acfb
* 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>