diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-18 18:47:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-19 07:46:44 -0800 |
| commit | 2d3ac9ad67b7038e1046dad3b1a273ba29282f31 (patch) | |
| tree | 6f4c3fce59de248fd58ebc0ad28e1eeb7d2fabc2 /contrib/examples/git-merge-ours.sh | |
| parent | Merge branch 'jc/maint-test-portability' into 'jc/test-portability' (diff) | |
| download | tgif-2d3ac9ad67b7038e1046dad3b1a273ba29282f31.tar.xz | |
t3600: Avoid "cp -a", which is a GNUism
With d4a7ffa (tests: "cp -a" is a GNUism, 2012-10-08), we got rid of
most of them, but the ones in a topic that was still in flight were
missed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions