Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
commit: drop duplicated parents
[gitweb.git]
/
t
/
t1002-read-tree-m-u-2way.sh
diff --git
a/t/t1002-read-tree-m-u-2way.sh
b/t/t1002-read-tree-m-u-2way.sh
index 42e5cf81813a7703ff2173dcc29e35ffdc68f552..e04990eafda82578c5e19971db7f87c3bc5a772f 100755
(executable)
--- a/
t/t1002-read-tree-m-u-2way.sh
+++ b/
t/t1002-read-tree-m-u-2way.sh
@@
-16,7
+16,7
@@
compare_change () {
sed >current \
-e '/^--- /d; /^+++ /d; /^@@ /d;' \
-e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1"
-
git diff
expected current
+
test_cmp
expected current
}
check_cache_at () {