Fix conflict resolution when the patch is empty.

Previosuly, an empty patch would result in a rever to the base revision,
instead of keepign the current revision.

Change-Id: I1d71775638fe2b6318fc22e6f2ac921104ffeef7
Merge "Fix conflict resolution when the patch is empty."