Merge branch 'aj/ada-diff-word-pattern'
commitc256661bbe09c842f7b6fe24986294d611f25200
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Feb 2014 19:55:10 +0000 (7 11:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Feb 2014 19:55:10 +0000 (7 11:55 -0800)
treec2445ea3675ec34008108213078b6963428f9713
parent53c2a5980ecd537a3cb76b748bac7760f7c96613
parent39a87a29ce364ed3337e535adce5973731ba2968
Merge branch 'aj/ada-diff-word-pattern'

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