view tests/test-merge4.out @ 2307:5b3a3e35f084

Add section for configuration notes with initial note about the default editor
author Lee Cantey <lcantey@gmail.com>
date Thu, 18 May 2006 10:09:16 -0700
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)