Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mergetool generating blank files (1.5.3)
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> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
- Loading branch information