From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Mar 2010 00:42:58 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=faf752693abd0a891a9a47a2d398353cc59ee93a;p=git.git

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
---

faf752693abd0a891a9a47a2d398353cc59ee93a