| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 4 Jun 2015 22:10:29 +0000 (15:10 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 4 Jun 2015 22:36:32 +0000 (15:36 -0700) | |
| commit | ef45bb1...8156030446658d5bfb3983ce214a9e16 |
| tree | 7f975d0...e99e0b6d6482e26db55b92db988a557c (tree) |
| parent | fdf96a2...acf96a6ac538df8113b2aafd6ed71d50 (diff) |
| Documentation/gitattributes.txt | diff | blob | history | |
| ll-merge.c | diff | blob | history | |
| t/t6026-merge-attr.sh | diff | blob | history |