![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Nov 2009 00:40:50 +0000 (16:40 -0800) | ||
| committer | Junio 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
mergetool--lib: add p4merge as a pre-configured mergetool option
| 1 | 2 | |||
|---|---|---|---|---|
| contrib/completion/git-completion.bash | patch | | diff1 | | diff2 | | blob | history |
diff --cc contrib/completion/git-completion.bash
Simple merge