view tests/test-merge4.out @ 8033:aeb4a5c7a28e

commands: consistently write switches as -a/--abc
author Martin Geisler <mg@lazybytes.net>
date Wed, 08 Apr 2009 21:20:31 +0200
parents 4b0c9c674707
children
line wrap: on
line source

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