diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 13:32:28 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:36:23 +0100 |
| commit | 965fdfed6e03d38b273baf1fa282a3d2ef828484 (patch) | |
| tree | 41198dad034473caea02c203900b8a8b1b65613a | |
| parent | d5a58eb3a50f0df4a764d9aa301f3f130c4b2465 (diff) | |
git-debrebase: merge: test suite: Do a bit more testing
We can now call t-gdr-good laundered, because it works.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | tests/tests/gdr-merge | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index baffedf..666672f 100755 --- 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 |