Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 00:42:58 +0000 (17:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 00:42:58 +0000 (17:42 -0700)
commitfaf752693abd0a891a9a47a2d398353cc59ee93a
treec68e63b1a514e4a8fe334cc86a8cf36fe3571673
parent10439d89ebe77a1fb8f05a8ad5d5f4071639bb3e
parent4c367c6ae978ef18477fba6b00458c32f1d49d0d
Merge branch 'maint'

* maint:
  t9350: fix careless use of "cd"
  difftool: Fix '--gui' when diff.guitool is unconfigured
  fast-export: don't segfault when marks file cannot be opened
builtin/fast-export.c