diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-03 14:16:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-03 14:16:17 -0700 |
| commit | 6a319e393b856461bab89ffe332a02e71befee40 (patch) | |
| tree | 730908c3beb0e261b4082db8b83cf11aa8c11b01 /git-merge-resolve.sh | |
| parent | Skip archive --remote tests on Windows (diff) | |
| parent | add gitignore entry to description about how to write a builtin (diff) | |
| download | tgif-6a319e393b856461bab89ffe332a02e71befee40.tar.xz | |
Merge branch 'maint'
* maint:
add gitignore entry to description about how to write a builtin
gitattributes: Reword "attribute macro" to "macro attribute"
gitattributes: Clarify discussion of attribute macros
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions