Mercurial > hg
view tests/test-rebase-abort.out @ 8056:f614f11a96ca
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
author | Pascal Quantin <pascal.quantin@gmail.com> |
---|---|
date | Sun, 25 Jan 2009 21:55:18 +0100 |
parents | 808f03f61ebe |
children | b345b1cc124f |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Abort rebase aborted @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1