Merge branch 'js/merge-edit-option'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 19:15:52 +0000 (11:15 -0800)
commiteb3b8d7...58331f4ec5f115d7407393d845644f5e
tree2ff9a37...38583242a41fc213d7e6f47789dc7610copy hash to clipboard (tree)
parent406da78...3217998ff6bf5dc69c55b1613556c2f4copy hash to clipboard (diff)
parentaad2a07...fcdc89fd63bf28a2ac2873712fb25e43copy hash to clipboard (diff)