annotate tests/test-merge4.out @ 962:5730e90c025b

Doc updates for push, pull, hooks, local tags, and ssh options
author mpm@selenic.com
date Fri, 19 Aug 2005 21:47:46 -0800
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source