diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 19:28:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 19:28:48 +0200 |
| commit | c15fadab65907e7fa1ae3a0dd5e05b722fd1f235 (patch) | |
| tree | 6576be6231027e0a0ce1cc27c00625552c944c3c /merge-file.c | |
| parent | Merge branch 'nd/doc-ignore' into maint (diff) | |
| parent | tests: "cp -a" is a GNUism (diff) | |
| download | git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.tar.xz git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.zip | |
Merge branch 'bw/cp-a-is-gnuism' into maint
* bw/cp-a-is-gnuism:
tests: "cp -a" is a GNUism
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions