Merge branch 'cc/revert-strategy'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:34:47 +0000 (22:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:34:47 +0000 (22:34 -0700)
commitf78eeea...55a4f60a05d3e6452f29a2214c29b6fd
tree24d7d6f...5b0bdf61cc6bd50a81b1e5500bb89265copy hash to clipboard (tree)
parentf350e1f...aa7070030a5c40acdaec650b47dfdc12copy hash to clipboard (diff)
parent91e5259...9665d69ace11b8f39618b1e8004fe19acopy hash to clipboard (diff)
builtin/merge.c
builtin/revert.c