Mercurial > hg
view tests/test-tag.out @ 1647:64a1169c927d
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sun, 29 Jan 2006 10:10:00 +1300 |
parents | 41366b7d6709 |
children | b7fc961507db |
line wrap: on
line source
changeset: 0:acb14030fe0a tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 summary: test changeset: 1:863197ef0378 tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 changeset: 0:acb14030fe0a tag: bleah user: test date: Thu Jan 1 00:00:00 1970 +0000 summary: test abort: working copy of .hgtags is changed (please commit .hgtags manually) failed acb14030fe0a21b60322c440ad2d20cf7685a376 bleah acb14030fe0a21b60322c440ad2d20cf7685a376 bleah0 863197ef03781c4fc00276d83eb66c4cb9cd91df bleah1 abort: '\n' cannot be used in a tag name abort: ':' cannot be used in a tag name