diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-03-26 08:39:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-03-26 08:39:38 +0000 |
| commit | 1de7572eb1aa483cc2aaca1db274928ffc6830f0 (patch) | |
| tree | ac708c90ee1a4a4765a9e852319760583d609fc6 /git-merge.txt | |
| parent | 625716ad62c5c0b2c57c90079944a7f6b914bb09 (diff) | |
| download | git-htmldocs-1de7572eb1aa483cc2aaca1db274928ffc6830f0.tar.gz | |
Autogenerated HTML docs for v1.6.2.1-389-geed1
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 cc0d30fe7..427ad9083 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -41,7 +41,7 @@ include::merge-strategies.txt[] If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with 'git-reset'. +want to start over, you can recover with 'git-reset'. CONFIGURATION ------------- |