[PATCH] Do not run useless show-diff on unmerged paths repeatedly.