Mercurial > hg
view tests/test-up-local-change.out @ 1668:586b50294ea8
[hgweb] Added rename information to gitweb templates & misc cleanups
Fixed up file log template's title
Removed double entry for filelogentry in gitweb map file
author | Josef "Jeff" Sipek <jeffpc@optonline.net> |
---|---|
date | Sun, 05 Feb 2006 20:52:55 -0500 |
parents | 3b1b44b917f4 |
children | dee55c4a4963 |
line wrap: on
line source
adding a diff -r c19d34741b0a a --- a/a +++ b/a @@ -1,1 +1,1 @@ a -a +abc adding b M a resolving manifests force None allow None moddirstate True linear True ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2 abort: outstanding uncommited changes failed resolving manifests force None allow 1 moddirstate True linear True ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e changeset: 1:1e71731e6fbb tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 summary: 2 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 tag: tip user: test date: Thu Jan 1 00:00:00 1970 +0000 files: a b description: 2 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e user: test date: Thu Jan 1 00:00:00 1970 +0000 files: a description: 1 diff -r 1e71731e6fbb a --- a/a +++ b/a @@ -1,1 +1,1 @@ a2 -a2 +abc