equal
deleted
inserted
replaced
99 removing 6 |
99 removing 6 |
100 removing 7 |
100 removing 7 |
101 removing 8 |
101 removing 8 |
102 removing 9 |
102 removing 9 |
103 adding a |
103 adding a |
104 recording removal of 9 as rename to a (100% similar) |
104 recording removal of 0 as rename to a (100% similar) |
105 $ hg revert -aq |
105 $ hg revert -aq |
106 |
106 |
107 pick one from many similar files |
107 pick one from many similar files |
108 |
108 |
109 $ cp 0 a |
109 $ cp 0 a |
122 removing 6 |
122 removing 6 |
123 removing 7 |
123 removing 7 |
124 removing 8 |
124 removing 8 |
125 removing 9 |
125 removing 9 |
126 adding a |
126 adding a |
127 recording removal of 9 as rename to a (99% similar) |
127 recording removal of 0 as rename to a (99% similar) |
128 $ hg commit -m 'always the same file should be selected' |
128 $ hg commit -m 'always the same file should be selected' |
129 |
129 |
130 should all fail |
130 should all fail |
131 |
131 |
132 $ hg addremove -s foo |
132 $ hg addremove -s foo |