summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-25 17:56:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-25 17:56:14 -0700
commit78bc46675353e4833a59e0f4dfa47d57a9c1a46b (patch)
tree7f30f1f4c230ccfab86b9a173d1d0cf8ec7bced4 /Documentation/git-merge.txt
parentgitweb: Fix handling of fractional timezones in parse_date (diff)
downloadtgif-78bc46675353e4833a59e0f4dfa47d57a9c1a46b.tar.xz
Git 1.7.4.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions