Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:47:03 +0000 (07:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 14:47:03 +0000 (07:47 -0700)
commitb91ffd37d5c18046f7b0bf47e939273bead9e52e
tree6b912973a29e5fa81340388f978904764f5a0f37
parentf2823263bd53b62831450277c746c6cbfcb95a15
parent4c8d4c14c6de59bc14d6118724ffee949e8654a7
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

* 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