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: Do a bit more testing
[dgit.git]
/
tests
/
tests
/
gdr-merge
diff --git
a/tests/tests/gdr-merge
b/tests/tests/gdr-merge
index baffedfc8722ba8becd599b6993e6d84839653d5..666672faa82ac01fbf8ee07f37a26f78dfdb25e5 100755
(executable)
--- a/
tests/tests/gdr-merge
+++ b/
tests/tests/gdr-merge
@@
-54,12
+54,13
@@
t-git-debrebase
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
t-git-debrebase
export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
t-git-debrebase
+t-gdr-good laundered
+t-git-debrebase
+t-gdr-good laundered
t-git-debrebase scrap
t-some-changes after
t-git-debrebase
t-git-debrebase scrap
t-some-changes after
t-git-debrebase
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-gdr-good laundered
t-ok
t-ok