diff options
Diffstat (limited to 'test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second')
| -rw-r--r-- | test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second index 79ace5379..f7790393b 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second +++ b/test/integration/discardFileChanges/expected/.git_keep/refs/heads/conflict_second @@ -1 +1 @@ -39d62c8a07e5103fef16c32373738ce92c4549b7 +854f08fa802293e0679d07771547fe9fe5d159e8 |