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)
* sb/maint-1.6.2-opt-filename-fix:
  apply, fmt-merge-msg: use relative filenames
  commit: -F overrides -t

1  2 
builtin-apply.c
builtin-fmt-merge-msg.c
t/t6200-fmt-merge-msg.sh

diff --cc builtin-apply.c
Simple merge
Simple merge
Simple merge