Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same
Updated Hungarian translation
Updated Hungarian translation
Fix up git conflict map
Flag files for conflict diff as temp (or not if they already exist)
Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same
Updated Spanish translation
Updated Hungarian translation
Updated Hungarian translation
Merge remote-tracking branch 'origin' into 3-way-on-conflict

Conflicts:
	meld/vc/git.py
	meld/vcview.py
Merge branch '3-way-on-conflict' of https://github.com/Psykar/meld into 3-way-on-conflict

Conflicts:
	meld/vc/git.py