bos@156: $ \textbf{hg init issue29} bos@156: $ \textbf{cd issue29} bos@156: $ \textbf{echo a > a} bos@156: $ \textbf{hg ci -Ama} bos@156: adding a bos@156: $ \textbf{echo b > b} bos@156: $ \textbf{hg ci -Amb} bos@156: adding b bos@156: $ \textbf{hg up 0} bos@156: 0 files updated, 0 files merged, 1 files removed, 0 files unresolved bos@156: $ \textbf{mkdir b} bos@156: $ \textbf{echo b > b/b} bos@156: $ \textbf{hg ci -Amc} bos@156: adding b/b bos@156: $ \textbf{hg merge} bos@156: