diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-08 18:55:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-08 18:55:50 -0700 |
| commit | 037c43c68e220739e690540de89a6d5835fefe73 (patch) | |
| tree | 3e201f833fc63e48db6983e45ce2425d884408db /t/diff-lib.sh | |
| parent | b1f47514f207b0601de7b0936cf13b3c0ae70081 (diff) | |
| parent | 9918285fb10d81af9021dae99c5f4de88ded497c (diff) | |
| download | git-037c43c68e220739e690540de89a6d5835fefe73.tar.gz git-037c43c68e220739e690540de89a6d5835fefe73.tar.xz | |
Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix
* ko/master: (2325 commits)
Git 1.7.2-rc2
backmerge a few more fixes to 1.7.1.X series
fix git branch -m in presence of cross devices
t/t0006: specify timezone as EST5 not EST to comply with POSIX
add missing && to submodule-merge testcase
t/README: document more test helpers
test-date: fix sscanf type conversion
xdiff: optimise for no whitespace difference when ignoring whitespace.
gitweb: Move evaluate_gitweb_config out of run_request
parse_date: fix signedness in timezone calculation
t0006: test timezone parsing
rerere.txt: Document forget subcommand
t/README: proposed rewording...
t/README: Document the do's and don'ts of tests
t/README: Add a section about skipping tests
t/README: Document test_expect_code
t/README: Document test_external*
t/README: Document the prereq functions, and 3-arg test_*
t/README: Typo: paralell -> parallel
t/README: The trash is in 't/trash directory.$name'
...
Conflicts:
builtin-read-tree.c
Diffstat (limited to 't/diff-lib.sh')
| -rw-r--r-- | t/diff-lib.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/diff-lib.sh b/t/diff-lib.sh index 4bddeb591..75a35fcd0 100644 --- a/t/diff-lib.sh +++ b/t/diff-lib.sh @@ -1,7 +1,5 @@ : -_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' -_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" sanitize_diff_raw='/^:/s/ '"$_x40"' '"$_x40"' \([A-Z]\)[0-9]* / X X \1# /' compare_diff_raw () { # When heuristics are improved, the score numbers would change. |