diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-22 23:14:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-22 23:14:59 -0800 |
| commit | 0e545f75169e2c260dfb4445203c23cafdfc76ef (patch) | |
| tree | e9863c4dbd66a9207e24ac3b8015e4475ed6bfa9 /Documentation/git-merge.txt | |
| parent | cc216827936e40bc2e8886623fd44f55e0674932 (diff) | |
| download | git-0e545f75169e2c260dfb4445203c23cafdfc76ef.tar.gz git-0e545f75169e2c260dfb4445203c23cafdfc76ef.tar.xz | |
Documentation: describe 'union' low-level merge driver
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index eabd7ef33..1521a9ee0 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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 |