5 # This software may be used and distributed according to the terms of the

     5 # This software may be used and distributed according to the terms of the

     6 # GNU General Public License version 2 or any later version.

     6 # GNU General Public License version 2 or any later version.

     7 

     7 

     8 '''pull, update and merge in one command (DEPRECATED)'''

     8 '''pull, update and merge in one command (DEPRECATED)'''

     9 

     9 

    11 

    10 

    12 from mercurial.i18n import _

    11 from mercurial.i18n import _

    13 from mercurial.node import short

    12 from mercurial.node import short

    14 from mercurial import (

    13 from mercurial import (

    15     cmdutil,

    14     cmdutil,