Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
grep: Add the option '--open-files-in-pager'
[gitweb.git]
/
t
/
t1001-read-tree-m-2way.sh
diff --git
a/t/t1001-read-tree-m-2way.sh
b/t/t1001-read-tree-m-2way.sh
index c2d408b46120ef9d962272b652a68a83ba0852a5..6327d205cb89b00e77502031e3b56b4b895cc32d 100755
(executable)
--- 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;' \