From 58ccf1fe579707c1eb78f7d18ee410d28d88d5e9 Mon Sep 17 00:00:00 2001 From: "Andrew J. Schorr" Date: Sun, 18 Jun 2017 10:10:21 -0400 Subject: Fix typo in doc/gawkworkflow.texi. --- doc/gawkworkflow.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/gawkworkflow.texi') diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi index 1bee193a..f9ec2088 100644 --- a/doc/gawkworkflow.texi +++ b/doc/gawkworkflow.texi @@ -1160,7 +1160,7 @@ chance for recovery, so be sure you really want to do it. As you work on your branch, you will occasionally want to bring it up to date with respect to @code{master}. -This @value{SECTION} discusses updating locale branches +This @value{SECTION} discusses updating local branches and handling merge conflicts. @menu -- cgit v1.2.3