Mercurial > hg
comparison mercurial/merge.py @ 15064:1f581a8b1948 stable
encoding: use getattr isntead of hasattr
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Mon, 25 Jul 2011 15:19:43 -0500 |
| parents | 28e98a8b173d |
| children | 3afe5edda4e3 |
comparison
equal
deleted
inserted
replaced
| 15063:c20688b7c061 | 15064:1f581a8b1948 |
|---|