Mercurial > hg
view tests/test-commit.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 | ef53d200df3d |
children | c9cd63a6fce9 |
line wrap: on
line source
abort: impossible time zone offset: 4444444 transaction abort! rollback completed abort: invalid date: '1\t15.1' transaction abort! rollback completed abort: invalid date: 'foo bar' transaction abort! rollback completed abort: invalid date: ' 1 4444' transaction abort! rollback completed abort: date exceeds 32 bits: 111111111111 transaction abort! rollback completed abort: No such file or directory: .../test/bar