tree c2445ea3675ec34008108213078b6963428f9713
parent 53c2a5980ecd537a3cb76b748bac7760f7c96613
parent 39a87a29ce364ed3337e535adce5973731ba2968
author Junio C Hamano <gitster@pobox.com> 1391802910 -0800
committer Junio C Hamano <gitster@pobox.com> 1391802910 -0800

Merge branch 'aj/ada-diff-word-pattern'

* aj/ada-diff-word-pattern:
  userdiff: update Ada patterns