Mercurial > hg
comparison mercurial/merge.py @ 25960:05d97407a8d1
minirst: use absolute_import
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 08 Aug 2015 19:42:16 -0700 |
| parents | 892d601f0d44 |
| children | 007ac1acfcac |
comparison
equal
deleted
inserted
replaced
| 25959:892d601f0d44 | 25960:05d97407a8d1 |
|---|