equal
deleted
inserted
replaced
93 $ hg ci -m 'remove bar' |
93 $ hg ci -m 'remove bar' |
94 $ echo 'memories of buried pirate treasure' > bar |
94 $ echo 'memories of buried pirate treasure' > bar |
95 $ hg merge |
95 $ hg merge |
96 bar: untracked file differs |
96 bar: untracked file differs |
97 abort: untracked files in working directory differ from files in requested revision |
97 abort: untracked files in working directory differ from files in requested revision |
98 [255] |
98 [20] |
99 $ cat bar |
99 $ cat bar |
100 memories of buried pirate treasure |
100 memories of buried pirate treasure |
101 |
101 |
102 Those who use force will lose |
102 Those who use force will lose |
103 |
103 |