Method test_ip_commit

gitless/tests/test_e2e.py:504–508

(self)

    self.__assert_history(self.__build('master') + self.__build(self.OTHER))

  def test_ip_commit(self):
    gl.fuse(self.OTHER, insertion_point=self.commits['master'][1])
    self.__assert_history(
        self.__build('master', [0, 1]) + self.__build(self.OTHER) +
        self.__build('master', range(2, self.COMMITS_NUMBER)))

  def test_conflicts(self):
    def trigger_conflicts():