chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
d5a58eb
)
git-debrebase: merge: test suite: Do a bit more testing
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 12:32:28 +0000
(13:32 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000
(15:36 +0100)
We can now call t-gdr-good laundered, because it works.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge
patch
|
blob
|
history
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
+t-gdr-good laundered
+t-git-debrebase
+t-gdr-good laundered
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