Show More
@@ -569,7 +569,9 b' def synclfdirstate(repo, lfdirstate, lfi' | |||
|
569 | 569 | else: |
|
570 | 570 | lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True) |
|
571 | 571 | elif state == b'm': |
|
572 |
lfdirstate. |
|
|
572 | lfdirstate.update_file( | |
|
573 | lfile, p1_tracked=True, wc_tracked=True, merged=True | |
|
574 | ) | |
|
573 | 575 | elif state == b'r': |
|
574 | 576 | lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False) |
|
575 | 577 | elif state == b'a': |
General Comments 0
You need to be logged in to leave comments.
Login now