diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-24 14:11:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-24 14:11:08 -0700 |
| commit | 63bccad38a754a1f1387a7dfe6703b27a44279cc (patch) | |
| tree | 85de2c3de40068e6876900a909276a4b78be93ec /t/t6020-merge-df.sh | |
| parent | Merge branch 'master' into next (diff) | |
| parent | Merge branch 'master' into lt/apply (diff) | |
| download | tgif-63bccad38a754a1f1387a7dfe6703b27a44279cc.tar.xz | |
Merge branch 'lt/apply' into next
* lt/apply:
Clean up sha1 file writing
Builtin git-cat-file
apply: force matching at the beginning.
Add a test-case for git-apply trying to add an ending line
apply: treat EOF as proper context.
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions