# Please pull mergetool.git

2 messages from 2007-09-29 to 2007-09-29. Participants: Theodore Ts'o, Junio C Hamano.
Thread: https://gitlist.dev/t/10076

## Theodore Ts'o, 2007-09-29 14:47

Subject: Please pull mergetool.git
Message-ID: <E1Ibdbb-0006Ep-NS@candygram.thunk.org>
URL: https://gitlist.dev/e/E1Ibdbb-0006Ep-NS%40candygram.thunk.org

```
Hi Junio,

Please pull from the "mergetool" branch at:
        git://repo.or.cz/git/mergetool.git mergetool

It contains the bug fixes for git mergetool discussed recently, and is
against the maint branch.   Thanks!

						- Ted

Junio C Hamano (1):
      Mergetool generating blank files (1.5.3)

Theodore Ts'o (2):
      mergetool: fix emerge when running in a subdirectory
      mergetool: Fix typo in options passed to kdiff3

```

## Junio C Hamano, 2007-09-29 22:43

Subject: Re: Please pull mergetool.git
Message-ID: <7vd4w1jdo7.fsf@gitster.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vd4w1jdo7.fsf%40gitster.siamese.dyndns.org
In-Reply-To: <E1Ibdbb-0006Ep-NS@candygram.thunk.org>

```
Thanks.

```