author | SZEDER Gábor <szeder@ira.uka.de> | |
Sun, 6 Apr 2008 01:23:44 +0000 (03:23 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700) | ||
commit | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 | |
tree | e09b26d17a873a63d94e7088dff143a0af14d574 | tree | snapshot |
parent | d8abe148bece83f6c3e5ebe6075aef236322ed74 | commit | diff |
Documentation/merge-config.txt | diff | blob | history | |
Documentation/merge-options.txt | diff | blob | history | |
git-merge.sh | diff | blob | history |