Forum Discussion

Gimpson's avatar
14 years ago

ccollab addgitdiffs not finding local diffs

I'm trying to create a review from a merge conflict in git.  When I run "git diff", I see a diff of the file in conflict.  (With conflict markers, this is how I intend the file to be created in the re...