projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3176bd0 c8998b4)
Merge branch 'sc/difftool-p4merge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:40:50 +0000 (16:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:40:50 +0000 (16:40 -0800)
* sc/difftool-p4merge:
  mergetool--lib: add p4merge as a pre-configured mergetool option

1  2 
contrib/completion/git-completion.bash patch | diff1 | diff2 | blob | history

Git—the stupid content tracker