diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-06-08 16:13:44 +0000 |
| commit | a77a51375dec1ea55c96563953187d6ce3d924cd (patch) | |
| tree | bd5e64c4f3d367dcf2be694575f0e5edcb03b1a7 /merge-options.txt | |
| parent | 359b40ddcc057e3c5e382544a151c97db2db5002 (diff) | |
| download | git-htmldocs-a77a51375dec1ea55c96563953187d6ce3d924cd.tar.gz | |
Autogenerated HTML docs for v1.5.2.1-144-gabc40
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 56f1d8d69..d64c259bb 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -25,4 +25,3 @@ If there is no `-s` option, a built-in list of strategies is used instead (`git-merge-recursive` when merging a single head, `git-merge-octopus` otherwise). - |