Junio C Hamano b371922aa5 Merge branch 'cb/mergetool' ...

* cb/mergetool:
  mergetool: fix running mergetool in sub-directories
  mergetool: Add a test for running mergetool in a sub-directory
  mergetool: respect autocrlf by using checkout-index

2009-02-05 19:40:35 -08:00

11 KiB

Executable File

Raw Blame History

View Raw