Mercurial > public > mercurial-scm > hg
comparison mercurial/mergestate.py @ 51699:ca7bde5dbafb
black: format the codebase with 23.3.0
The CI has moved to 23.3.0, which is the last version that supports 3.7
at runtime, so we should honor this change.
# skip-blame mass-reformating only
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Thu, 18 Jul 2024 12:36:12 +0200 |
| parents | 7f0cb9ee0534 |
| children | f4733654f144 |
comparison
equal
deleted
inserted
replaced
| 51698:b0a4de6c14f8 | 51699:ca7bde5dbafb |
|---|---|
| 493 actions[action].append((f, None, b"merge result")) | 493 actions[action].append((f, None, b"merge result")) |
| 494 return actions | 494 return actions |
| 495 | 495 |
| 496 | 496 |
| 497 class mergestate(_mergestate_base): | 497 class mergestate(_mergestate_base): |
| 498 | |
| 499 statepathv1 = b'merge/state' | 498 statepathv1 = b'merge/state' |
| 500 statepathv2 = b'merge/state2' | 499 statepathv2 = b'merge/state2' |
| 501 | 500 |
| 502 @staticmethod | 501 @staticmethod |
| 503 def clean(repo): | 502 def clean(repo): |