Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > After compiling and installing, something like this should be fun to > watch: > > $ git rev-list --all --parents | \ > grep " .* " | \ > while read commit parent1 parent2 otherparents > do > test -z "$otherparents" || continue > git checkout $parent1 && > git merge $parent2 && > git diff > without-patience.txt && > ... > if ! cmp without-patience.txt with-patience.txt > then > echo '===============================' > echo "differences found in merge $commit" > ... > cat with-patience.txt > fi || > exit > done | tee patience-merge.out An even more interesting test would be possible by dropping "&&" from the two "git merge" invocations. - Your sample will exit at the first conflicting merge otherwise. - You may find cases where one resolves cleanly while the other leaves conflicts. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
