Mercurial > hg
annotate tests/test-resolve.out @ 10301:56b50194617f
templates: rename `Last change' column in hgwebdir repository list.
This patch changes column headers in the templates that previously
said `Last change' to `Last modified'. Neither code nor functionality
are changed other than that.
For some time now, I have been annoyed by the fact the `Last change'
column didn't list the age of the youngest changeset in the
repository, or at least tip. It just occurred to me that this is
because the wording is slightly misleading; what the column in fact
lists is when the repository was last *modified*, that is, when
changesets was last added or removed from it.
The word `change' can be understood as referring to the changeset
itself. Using `changed' would be ever so slightly less
amigous. However, the standard nomenclature in this case is
`modification date' and `Last modified', which is incidentally entirely
unambigous. Hence, `Last modified' is the wording used.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Sun, 24 Jan 2010 20:51:53 +0100 |
| parents | b2310903c462 |
| children | 51021f4c80b5 |
| rev | line source |
|---|---|
| 7734 | 1 adding file |
| 2 % create a second head | |
| 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 4 created new head | |
| 5 % failing merge | |
| 6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
7821
diff
changeset
|
7 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 7734 | 8 % resolve -l, should be empty |