Mercurial > hg
view tests/test-rebase-rename.out @ 12179:1447d3a9ff4a
check-code: fix ternary expression introduced in 1ef9b0b5efec
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Wed, 08 Sep 2010 15:16:03 +0200 |
parents | 4bb4895e1693 |
children |
line wrap: on
line source
adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Rename is tracked 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed % Rebase the revision containing the rename % Rename is not lost 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Copy is tracked 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied % Rebase the revision containing the copy % Copy is not lost 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied