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: Actually record merge resolutions
[dgit.git]
/
tests
/
tests
/
gdr-merge-conflicts
diff --git
a/tests/tests/gdr-merge-conflicts
b/tests/tests/gdr-merge-conflicts
index f0abea79572c7ce9fec02b7a2537081814aeeac4..12e7055aaa2f59f8daec382d885b6231af641b30 100755
(executable)
--- 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