Re: Mergetool generating blank files (1.5.3)
- From
Theodore Tso <tytso@mit.edu>
- Date
- Sep 27, 2007, 22:35 UTC
- Message-ID
- <20070927223550.GC8688@thunk.org>
- In-Reply-To
- <7vir5vss58.fsf@gitster.siamese.dyndns.org>
On Thu, Sep 27, 2007 at 02:41:23PM -0700, Junio C Hamano wrote:
Show 6 quoted lines
> When mergetool is run from a subdirectory, "ls-files -u" nicely > limits the output to conflicted files in that directory, but > we need to give the full path to cat-file plumbing to grab the > contents of stages. > > Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
- Ted