On Saturday, September 1, 2018 7:18:34 PM MST Eric Sunshine wrote:
quoted
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
@@ -682,4 +682,12 @@ test_expect_success '--dry-run with conflicts fixed
from a merge' ' +test_expect_failure '--dry-run --short' '
+ # setup two branches with conflicting information
+ # in the same file, resolve the conflict
What is this comment all about? It doesn't seem to have any relation
to what the test itself is actually doing. (I see that it was copied
from an earlier test in this script, but that doesn't help me
understand what it is trying to say.)
Agreed.
I saw your other email about not being worth a re-roll, but I've made the
change locally in case Junio wants me to do so.
Additionally if there are other comments I can wrap them into a single set.