conflicts: Fix nil pointer access when conflict has no ancestor

If the conflict resolver is unable to parse the diff with conflict markers and the conflict had no ancestor, previously the git2go process would crash due to a nil pointer access. Since the ancestor may not exist for this file, just use the our path instead.

Relates to #4720 (closed)