diff --git a/README.txt b/README.txt index 512bc53..1d98da0 100644 --- a/README.txt +++ b/README.txt @@ -587,6 +587,17 @@ $ git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. +kolya@Nikolay MINGW64 ~/Desktop/lab02/alice/project (main) +$ git merge double +Updating e9b63fb..20dc1e5 +Fast-forward + main.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +//// +История с ошибкой утеряна из-за непреднамеренного перезапуска компьютера. +//// + kolya@Nikolay MINGW64 ~/Desktop/lab02/alice/project (main) $ git fetch remote: Enumerating objects: 5, done.