diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-12-23 08:16:38 +0000 |
| commit | f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238 (patch) | |
| tree | 492751e5dfadd3be5f438844968502b050c72c54 /git-merge.txt | |
| parent | e27cbd23f20512f381606e2b437bfe80c681aa93 (diff) | |
| download | git-htmldocs-f556fc2a7c28ca2b4097c2c8b0180de3b8ca7238.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc1-21-g0e545
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index eabd7ef33..1521a9ee0 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -163,7 +163,8 @@ After seeing a conflict, you can do two things: SEE ALSO -------- -gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1] +gitlink:git-fmt-merge-msg[1], gitlink:git-pull[1], +gitlink:gitattributes[5] Author |