2954                 or merge

  2954                 or merge

  2955                 or cctx.files()

  2955                 or cctx.files()

  2956                 or self.ui.configbool(b'ui', b'allowemptycommit')

  2956                 or self.ui.configbool(b'ui', b'allowemptycommit')

  2957             )

  2957             )

  2958             if not allowemptycommit:

  2958             if not allowemptycommit:

  2959                 return None

  2960                 return None

  2960 

  2961 

  2961             if merge and cctx.deleted():

  2962             if merge and cctx.deleted():

  2962                 raise error.Abort(_(b"cannot commit merge with missing files"))

  2963                 raise error.Abort(_(b"cannot commit merge with missing files"))

  2963 

  2964