equal
deleted
inserted
replaced
45 abort: there is nothing to merge |
45 abort: there is nothing to merge |
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
47 % nothing to merge |
47 % nothing to merge |
48 abort: there is nothing to merge - use "hg update" instead |
48 abort: there is nothing to merge - use "hg update" instead |
49 % load unknown parent |
49 % load unknown parent |
50 abort: merge parent e6da4671640124fe5d3d70d2f54441d6cd76ae35 not in repository |
50 abort: merge parent e6da46716401 not in repository |