diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2017-04-07 09:17:14 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2017-04-07 09:17:14 +0300 |
| commit | 0d3bc6ff432fe62a6e46c543311d86c2781915c2 (patch) | |
| tree | d84976983d5233c5d91b294eaa829d7bedfa3301 /doc/gawkworkflow.texi | |
| parent | 0cd7d9c122b3893a92ba6c26d04911520d7f8e68 (diff) | |
| parent | 947dfae8571472b6e78aecad8da024f1f65e5bf5 (diff) | |
| download | egawk-0d3bc6ff432fe62a6e46c543311d86c2781915c2.tar.gz egawk-0d3bc6ff432fe62a6e46c543311d86c2781915c2.tar.bz2 egawk-0d3bc6ff432fe62a6e46c543311d86c2781915c2.zip | |
Merge branch 'master' into feature/api-parser
Diffstat (limited to 'doc/gawkworkflow.texi')
| -rwxr-xr-x | doc/gawkworkflow.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi index 4d9ddd05..1bee193a 100755 --- a/doc/gawkworkflow.texi +++ b/doc/gawkworkflow.texi @@ -246,7 +246,7 @@ This file describes how to participate in software development for development. * Using Git:: Getting started with Git. * Configuring git:: Configuring Git. -* Development without commit access:: How to wwork without commit access. +* Development without commit access:: How to work without commit access. * Development with commit access:: How to work with commit access. * General practices:: How things should usually be done. * Repo Maintenance:: Tips for keeping your repo clean. @@ -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} dicusses updating locale branches +This @value{SECTION} discusses updating locale branches and handling merge conflicts. @menu |