Merge branch 'sc/difftool-p4merge'
* sc/difftool-p4merge: mergetool--lib: add p4merge as a pre-configured mergetool option
Junio C Hamano committed
Nov 15, 2009 at 16:40 UTC
9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e
No changes.