Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-static-http.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:14:29 +0200 |
| parents | d90a9d7c7d4d |
| children | 109a22f5434a |
line wrap: on
line source
abort: Connection refused 255 copy: No such file or directory changeset: 0:53e17d176ae6 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: test requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions foo pulling from static-http://localhost:20059/remote searching for changes no changes found