Mercurial > hg
comparison mercurial/simplemerge.py @ 6410:644a56c7ae79
fix bug introduced by 894875eae49b (short not defined)
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 30 Mar 2008 22:22:53 +0200 |
| parents | e75aab656f46 |
| children | 810ca383da9c |
comparison
equal
deleted
inserted
replaced
| 6409:47f4a47161b4 | 6410:644a56c7ae79 |
|---|