Merge branch 'rt/commentchar-fmt-merge-msg'
commit6ae5d9863ba13b5d138851d8e622c9ed05313966
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:45:01 +0000 (19 13:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2013 20:45:01 +0000 (19 13:45 -0700)
treedbd24f2f5d334f6348a83b99f1039b2c8a44c5d8
parent4407ea49fe47e90953f187279d55eb93f89a3530
parent16a794de889ecc11ccbcd5ecf998a128d6dbfa97
Merge branch 'rt/commentchar-fmt-merge-msg'

A test fix for recent update.

* rt/commentchar-fmt-merge-msg:
  t6200: avoid path mangling issue on Windows
t/t6200-fmt-merge-msg.sh