gg-scm/gg

Add test case for merge conflicts in gg update

zombiezen opened this issue · 0 comments

I've manually tested that the behavior of gg update with merge conflicts is to succeed, but it would be good to have a test case that checks this behavior.