diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-28 08:55:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-28 08:55:34 +0000 |
| commit | 36a567279a3e94474750eacd210f308ef21d446e (patch) | |
| tree | b26a9c8bab6824ff98c99dca17eafb3cc022ad28 /git-merge.txt | |
| parent | 1de7572eb1aa483cc2aaca1db274928ffc6830f0 (diff) | |
| download | git-htmldocs-36a567279a3e94474750eacd210f308ef21d446e.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-404-gb008
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 427ad9083..c04ae739e 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -40,7 +40,7 @@ include::merge-options.txt[] include::merge-strategies.txt[] -If you tried a merge which resulted in a complex conflicts and +If you tried a merge which resulted in complex conflicts and want to start over, you can recover with 'git-reset'. CONFIGURATION |