Merge branch 'sb/maint-1.6.2-opt-filename-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2009 22:01:16 +0000 (15:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2009 22:01:16 +0000 (15:01 -0700)
commit9affecbc89538b6fd63f772b6f14047bced9345e
treeb4047fd9dec7f6dde2c1d41eae23d8ce74375dc4
parent659f09689614d3d745b9aea746672bf43216d294
parent4c8d4c14c6de59bc14d6118724ffee949e8654a7
Merge branch 'sb/maint-1.6.2-opt-filename-fix'

* sb/maint-1.6.2-opt-filename-fix:
  apply, fmt-merge-msg: use relative filenames
  commit: -F overrides -t
builtin-apply.c
builtin-fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh