Documentation / RelNotes / 1.7.9.6.txton commit Merge branch 'jk/color-diff-plain-is-context' into maint (6998d89)
   1Git v1.7.9.6 Release Notes
   2==========================
   3
   4Fixes since v1.7.9.5
   5--------------------
   6
   7 * "git merge $tag" to merge an annotated tag always opens the editor
   8   during an interactive edit session. v1.7.10 series introduced an
   9   environment variable GIT_MERGE_AUTOEDIT to help older scripts decline
  10   this behaviour, but the maintenance track should also support it.
  11
  12Also contains minor fixes and documentation updates.