Skip to content
Snippets Groups Projects
Commit 34fd5ca5 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Handle "no changes" case on conflict resolving 


Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent c68adbf9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment