Method __assert_resolve_fp

gitless/tests/test_core.py:729–733

(self, *fps)

        ValueError, 'no conflicts', self.curr_b.resolve_file, TRACKED_FP)

  def __assert_resolve_fp(self, *fps):
    for fp in fps:
      self.curr_b.resolve_file(fp)
      st = self.curr_b.status_file(fp)
      self.assertFalse(st.in_conflict)

  @assert_contents_unchanged(FP_IN_CONFLICT, DIR_FP_IN_CONFLICT)
  def test_resolve_fp_with_conflicts(self):