author | Tay Ray Chuan <rctay89@gmail.com> |
---|---|
Mon, 10 May 2010 17:17:52 +0000 (01:17 +0800) | |
committer | Junio C Hamano <gitster@pobox.com> |
Mon, 10 May 2010 19:02:20 +0000 (12:02 -0700) | |
commit | f0ecac2 ... 70bf6b44b89dfa493abd2f544010b1eb |
tree | 2fd6c98 ... 05ae583f32b25d9ee36567e5a2554b65 (tree) |
parent | 8c6bdfd ... 8ba9a3d7a03d64b7a98305a460921130 (diff) |
Documentation/git-merge.txt | diff | blob | history | |
builtin/fmt-merge-msg.c | diff | blob | history | |
builtin/merge.c | diff | blob | history | |
t/t7604-merge-custom-message.sh | diff | blob | history |