diff options
Diffstat (limited to 'tests/tests/gdr-merge-conflicts')
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index f0abea7..12e7055 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -112,7 +112,6 @@ git commit -m FIX git reset --hard git clean -xdff -t-expect-fail F:todo \ t-git-debrebase record-resolved-merge git checkout master |