From 61888076bc8bdc8f92f8028dbc69e5919f286ac5 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Tue, 12 Jun 2018 09:50:50 -0400
Subject: [PATCH] advanced-merging.asc: correct obvious typo, "lose" ->
 "preserve"

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
---
 book/07-git-tools/sections/advanced-merging.asc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/07-git-tools/sections/advanced-merging.asc b/book/07-git-tools/sections/advanced-merging.asc
index 24e66221b..bc35f988a 100644
--- a/book/07-git-tools/sections/advanced-merging.asc
+++ b/book/07-git-tools/sections/advanced-merging.asc
@@ -19,7 +19,7 @@ While we covered some basics on resolving merge conflicts in <<ch03-git-branchin
 First of all, if at all possible, try to make sure your working directory is clean before doing a merge that may have conflicts.
 If you have work in progress, either commit it to a temporary branch or stash it.
 This makes it so that you can undo *anything* you try here.
-If you have unsaved changes in your working directory when you try a merge, some of these tips may help you lose that work.
+If you have unsaved changes in your working directory when you try a merge, some of these tips may help you preserve that work.
 
 Let's walk through a very simple example.
 We have a super simple Ruby file that prints 'hello world'.