Patch Set 4:

1. Skipping "ignored" files and folders now
2. Enable Merge Tool menu item also if repository state is REBASING*
3. Use ORIG_HEAD instead of MERGE_HEAD as "right" version when repository state is not MERGING