diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:03:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:03:43 -0700 |
| commit | 5c44cc9ea29b74ed10f5f239791b2c2f9586f197 (patch) | |
| tree | 229ac0b470b16816573dbee84e71e2d02fd9798c /Documentation/gitattributes.txt | |
| parent | Merge branch 'jk/maint-1.6.0-trace-argv' into maint (diff) | |
| parent | merge-recursive: never leave index unmerged while recursing (diff) | |
| download | tgif-5c44cc9ea29b74ed10f5f239791b2c2f9586f197.tar.xz | |
Merge branch 'do/maint-merge-recursive-fix' into maint
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
Diffstat (limited to 'Documentation/gitattributes.txt')
0 files changed, 0 insertions, 0 deletions