Show More
@@ -894,6 +894,7 b' class localrepository:' | |||
|
894 | 894 | self.ui.debug("working dir created %s, keeping\n" % f) |
|
895 | 895 | |
|
896 | 896 | for f, n in m2.iteritems(): |
|
897 | if f[0] == "/": continue | |
|
897 | 898 | if f in ma and n != ma[f]: |
|
898 | 899 | r = self.ui.prompt( |
|
899 | 900 | ("remote changed %s which local deleted\n" % f) + |
@@ -935,7 +936,7 b' class localrepository:' | |||
|
935 | 936 | files = merge.keys() |
|
936 | 937 | files.sort() |
|
937 | 938 | for f in files: |
|
938 |
self.status("mer |
|
|
939 | self.ui.status("merging %s\n" % f) | |
|
939 | 940 | m, o = merge[f] |
|
940 | 941 | self.merge3(f, m, o) |
|
941 | 942 | self.dirstate.update([f], 'm') |
General Comments 0
You need to be logged in to leave comments.
Login now