diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-07 07:33:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-07 07:33:38 (GMT) |
| commit | 7141b3b78099941f25b17388f56a917d4f7af51d (patch) | |
| tree | e7ff595f1fb6068b11a3a2c7eb71110faea998b8 /Documentation/git-merge.txt | |
| parent | 72e5890b68e7199d92620d3bba91fa36dd259404 (diff) | |
| parent | 44760f1d559ae2087e53be6971ad4f1a8f18f1d7 (diff) | |
| download | git-7141b3b78099941f25b17388f56a917d4f7af51d.zip git-7141b3b78099941f25b17388f56a917d4f7af51d.tar.gz git-7141b3b78099941f25b17388f56a917d4f7af51d.tar.bz2 | |
Merge branch 'master'
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index b3ef19b..904e2fc 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -19,7 +19,7 @@ which drives multiple merge strategy scripts. OPTIONS ------- -include::merge-pull-opts.txt[] +include::merge-options.txt[] <msg>:: The commit message to be used for the merge commit (in case |