X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft1001-read-tree-m-2way.sh;h=6327d205cb89b00e77502031e3b56b4b895cc32d;hb=055e1e29696c0fb06582c1592ee6b58643dcc514;hp=c2d408b46120ef9d962272b652a68a83ba0852a5;hpb=e8a285e553f8c6c04820a542b2a28816a9d62d3c;p=git.git diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index c2d408b46..6327d205c 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;' \