diff options
| author |  Brandon Casey <casey@nrlssc.navy.mil> | 2008-08-18 18:17:53 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-08-18 23:27:14 -0700 |
| commit | 26e08a0190cb3354e43bab13ea693a5c826a8fe1 (patch) | |
| tree | e665fec44ab923cf49472b84a437a9e5347e8d9c /ll-merge.c | |
| parent | adapt git-cvsserver manpage to dash-free syntax (diff) | |
| download | tgif-26e08a0190cb3354e43bab13ea693a5c826a8fe1.tar.xz | |
t1002-read-tree-m-u-2way.sh: use 'git diff -U0' rather than 'diff -U0'
Some old platforms have an old diff which doesn't have the -U option.
'git diff' can be used in its place. Adjust the comparison function to
strip git's additional header lines to make this possible.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions