diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 11:32:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 11:38:39 +0100 |
| commit | 0323a891b385296fd346dd1ea794c5c2ee8229a0 (patch) | |
| tree | 647ffc5f295f891093deda3d158c7ed12babf331 /tests | |
| parent | 770df553c36474e58926dfe833d97b375cd9c272 (diff) | |
git-debrebase: merge: test suite: Test both with and without `after'
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
| -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 7a6ffdb..25b2ee0 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -48,15 +48,16 @@ t-git-debrebase quick git merge other -t-some-changes after -# xxx ^ commenting out this line produces an internal error - t-expect-fail E:'general two-parent merge' \ t-git-debrebase export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1 t-git-debrebase +t-git-debrebase scrap + +t-some-changes after +t-git-debrebase # xxx want to check that we DTRT if we start out unstitched - # xxx should consider our ffq-prev as a parent |