tests/test-tags.out
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
Mon, 06 Feb 2006 17:32:00 -0600
changeset 1699 83e8cd97b9f9
parent 993 6f274afc05c7
child 1933 7544700fd931
permissions -rw-r--r--
hgmerge: add and use more tool variables This patch adds even more customisable variables with tool paths. Also moves $FILEMERGE where it belongs.

unknown
acb14030fe0a tip
acb14030fe0a21b60322c440ad2d20cf7685a376 first
tip                                1:b9154636be938d3d431e75a7c906504a079bfe07
first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376
b9154636be93 tip
M a
b9154636be93+ tip
acb14030fe0a+ first
acb14030fe0a21b60322c440ad2d20cf7685a376+ first
M a
c8edf04160c7 tip
c8edf04160c7+b9154636be93+ tip
M .hgtags