diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-06-18 10:11:19 -0400 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2017-06-18 10:11:19 -0400 |
| commit | d8332ae3fad279790df98ef8422cad916454ea4b (patch) | |
| tree | fbbfc02c0fce947b69cea248834baffabc4b75e2 /doc/gawkworkflow.texi | |
| parent | 4185899b49f2076b82bb25c19ded1bbe862b7cad (diff) | |
| parent | 58ccf1fe579707c1eb78f7d18ee410d28d88d5e9 (diff) | |
| download | egawk-d8332ae3fad279790df98ef8422cad916454ea4b.tar.gz egawk-d8332ae3fad279790df98ef8422cad916454ea4b.tar.bz2 egawk-d8332ae3fad279790df98ef8422cad916454ea4b.zip | |
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'doc/gawkworkflow.texi')
| -rw-r--r-- | doc/gawkworkflow.texi | 2 |
1 files changed, 1 insertions, 1 deletions
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 |