view tests/test-commit-copy.out @ 7785:660c8dd44060

test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 10 Feb 2009 22:47:38 +0100
parents 6990e499d71a
children
line wrap: on
line source

foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       6      0       0 26d3ca0dfd18 000000000000 000000000000
     1         6       7      1       1 d267bddd54f7 26d3ca0dfd18 000000000000