annotate tests/test-merge4.out @ 958:d845a1f174bb

Make mercurial.el load with GNU emacs
author mpm@selenic.com
date Fri, 19 Aug 2005 18:47:05 -0800
parents 5a034646e472
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source