chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-debrebase: merge: test suite: Use t-ref-same-start
[dgit.git]
/
tests
/
tests
/
gdr-merge
diff --git
a/tests/tests/gdr-merge
b/tests/tests/gdr-merge
index a213385a06de5e44af7a492fbf361d2402bf97fb..07ded5a3172bef6862d924b16ab4c76d087e4968 100755
(executable)
--- a/
tests/tests/gdr-merge
+++ b/
tests/tests/gdr-merge
@@
-66,8
+66,12
@@
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
t-git-debrebase
t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
t-git-debrebase
-t-gdr-good laundered
+t-ref-head
+
t-git-debrebase scrap
t-some-changes after