![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Dec 2007 07:14:59 +0000 (23:14 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 23 Dec 2007 07:14:59 +0000 (23:14 -0800) | ||
| commit | 0e545f75169e2c260dfb4445203c23cafdfc76ef | |
| tree | e9863c4dbd66a9207e24ac3b8015e4475ed6bfa9 | tree | snapshot |
| parent | cc216827936e40bc2e8886623fd44f55e0674932 | commit | diff |
Documentation: describe 'union' low-level merge driver
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-check-attr.txt | diff | blob | history | |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/gitattributes.txt | diff | blob | history |