[meld/VersionControlRework] (28 commits) ...vcview: Fix bad merge

[Kai Willadsen <kaiw src gnome org>]

Summary of changes:

  6587c30...  Update NEWS (*)
  21d4d08...  Post-release version bump (*)
  7b9cc23... Updated Portuguese translation (*)
  1685a03... meld.1: Fix incorrect command line option capitalisation (*)
  47844ef... Fix typos in documentation (*)
  d470004... Fix broken test, simplify test asserts and facilitate runni (*)
  499c612... maint: Don't add spurious spaces to commit messages (*)
  4ed20b9... maint: PEP8 (*)
  c896cb8... Updated Czech translation (*)
  dd922d2... Updated Hungarian translation (*)
  16d1cc0... meldbuffer: Another newline disagreement added (bgo#750197) (*)
  addcf90... meld.1: Update man page list of supported VCs (*)
  990e08e... meld.1: Update man page options listing (*)
  5bbb7df... meldapp: Reorder tab creation to create the main comparison (*)
  f0bfe2c... meldapp: Only apply labels to the first created comparison (*)
  6b57750... meldapp: Fix call ordering to present only our new window ( (*)
  ca28a9c... meldbuffer, misc: Decode file labels use filesystem + UTF8  (*)
  94cef69... misc: Make fallback_decode handle getting an unexpected uni (*)
  0a58fa9... vc.git: Don't do display-side decoding in version control b (*)
  771bb2a... vcview: Add non-decoding path helper and use for path acces (*)
  6cfdf62... vcview: Decode paths for display where required (*)
  07dfe6d... newdifftab: Avoid decoding paths for VcView; it wants bytes (*)
  2d60d11... recent: Fix recent-comparison existing comparison check (*)
  529f257... dirdiff, filediff: Add a hack to revert overlay scrolling ( (*)
  388f2a8... meldapp: Fix incorrect relative path with --output (bgo#749 (*)
  557b41d... Merge branch 'master' into VersionControlRework
  507a213... vcview: Remove unused variable
  1e88b91... vcview: Fix bad merge

(*) This commit already existed in another branch; no separate mail sent