aboutsummaryrefslogtreecommitdiffstats
path: root/using-git.texinfo
diff options
context:
space:
mode:
Diffstat (limited to 'using-git.texinfo')
-rw-r--r--using-git.texinfo2
1 files changed, 1 insertions, 1 deletions
diff --git a/using-git.texinfo b/using-git.texinfo
index d4bb71b..064bbf2 100644
--- a/using-git.texinfo
+++ b/using-git.texinfo
@@ -1381,7 +1381,7 @@ not a file you can open and se the conflicts in
so you must open both's versions and manual
inspect and merge them.
-Luckly most type of files formats have an
+Luckily most type of files formats have an
text based alternative.
@table @asis