diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-09-20 11:10:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-03 21:17:16 -0800 |
| commit | cd3c095caa6f61b4a2952e7ea167938c5b69bc3d (patch) | |
| tree | e37f337b8953bf175a515016bcd059bb731f79de /t/t1001-read-tree-m-2way.sh | |
| parent | Git 1.6.6 (diff) | |
| download | tgif-cd3c095caa6f61b4a2952e7ea167938c5b69bc3d.tar.xz | |
tests: move convenience regexp to match object names to test-lib.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index c2d408b461..6327d205cb 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -26,8 +26,6 @@ read_tree_twoway () { git read-tree -m "$1" "$2" && git ls-files --stage } -_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" compare_change () { sed -n >current \ -e '/^--- /d; /^+++ /d; /^@@ /d;' \ |