Mercurial > hg
view tests/test-rebase-keep-branch.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 | 3e5db4228f8f |
children | 609ce91670d0 |
line wrap: on
line source
0 files updated, 0 files merged, 2 files removed, 0 files unresolved marked working directory as branch notdefault created new head @ 4:r1:notdefault | | o 3:l2: | | | o 2:l1: |/ o 1:c2: | o 0:c1: % Rebase a branch while preserving the branch name 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files rebase completed @ 4:r1:notdefault | o 3:l2: | o 2:l1: | o 1:c2: | o 0:c1: