(self)
| 657 | class TestMerge(TestOp): |
| 658 | |
| 659 | def test_uncommitted_changes(self): |
| 660 | utils.write_file(self.MASTER_FILE, contents='uncommitted') |
| 661 | utils.write_file('master_untracked', contents='uncommitted') |
| 662 | gl.merge(self.OTHER) |
| 663 | self.assertEqual('uncommitted', utils.read_file(self.MASTER_FILE)) |
| 664 | self.assertEqual('uncommitted', utils.read_file('master_untracked')) |
| 665 | |
| 666 | def test_uncommitted_tracked_changes_that_conflict(self): |
| 667 | gl.branch(c='tmp', divergent_point='HEAD~1') |