diff mercurial/merge.py @ 16966:23f621ca04b5

tests/hghave: extract hghave.py hghave is degraded to a bare script, moving the functions to hghave.py so they can be shared later on.
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 14 Jun 2012 12:54:54 +0200
parents 98687cdddcb1
children ce7bc04d863b
line wrap: on
line diff