| author | Markus Heidelberg <markus.heidelberg@web.de> |
|---|---|
| Mon, 6 Apr 2009 08:31:18 +0000 (01:31 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 8 Apr 2009 05:19:55 +0000 (22:19 -0700) | |
| commit | b98c212...9fd97300a8cf39015b8d693f319fd71c |
| tree | a5786f8...82dba31f7b168592295e351f10e40e22 (tree) |
| parent | bad4273...008cb0c1e77046d716e4446b1545d4d0 (diff) |
| Documentation/git-mergetool.txt | diff | blob | history | |
| Documentation/merge-config.txt | diff | blob | history | |
| git-mergetool.sh | diff | blob | history |