summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:09:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-30 13:16:51 -0700
commit0e4c8822e98e27c3c63125570c8bcbf0a8fd34da (patch)
tree65c57c73c1a4862f625af5a6daf8f7506fccf22e /Documentation/technical/trivial-merge.txt
parentMerge branch 'jk/maint-commit-document-editmsg' into maint (diff)
downloadtgif-0e4c8822e98e27c3c63125570c8bcbf0a8fd34da.tar.xz
Git 1.7.11.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions