[PATCH 06 of 10] simplemerge: update to conform with modern import conventions

[Yuya Nishihara]

On Wed, 23 Aug 2017 10:55:05 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <raf at durin42.com>
> # Date 1503425593 14400
> #      Tue Aug 22 14:13:13 2017 -0400
> # Node ID a513d142d47423242743902f8e94d033c8ecc563
> # Parent  ab897b232da53bc7b198027103de5e521f6e8e29
> simplemerge: update to conform with modern import conventions

Queued the series, thanks.

> --- a/contrib/simplemerge
> +++ b/contrib/simplemerge
> @@ -1,12 +1,20 @@
>  #!/usr/bin/env python
> -
> -from mercurial import demandimport
> -demandimport.enable()
> +from __future__ import absolute_import
>  
>  import getopt
>  import sys
> +
> +import hgdemandimport
> +hgdemandimport.enable()

This makes the import of getopt non-lazy, but that should be okay because
getopt isn't big and is loaded anyway.