javadoc
handling non-smart aware editors
IDEA-99614 Changes log graph starts hilighted
Merge remote branch 'origin/master'
IDEA-81214 Conflict Resolver confusion with Mercurial  bug fixed

* If we have merge in progress, which means we have 2 heads (parents), so the revision with greater revision number (not the second one ) is "their" revision pulled from the parent repo, and the revision with lesser revision number (not always first) is the local change.
[git] Don't add startFailed exception stack trace into the error output

Use a separate field of GitCommandResult for that.
[git] Improve notification if exception happens during collecting of unmerged files
deprecated method