Merge remote branch 'refs/remotes/nex3/guess-branch-guesses-commits'

This commit is contained in:
Phil Jackson 2010-08-02 15:03:51 +01:00
commit d1b467c6f6

View file

@ -2786,6 +2786,7 @@ Fails if working tree or staging area contain uncommitted changes.
(magit-section-case (item info) (magit-section-case (item info)
((wazzup commit) ((wazzup commit)
(magit-section-info (magit-section-parent item))) (magit-section-info (magit-section-parent item)))
((commit) (substring info 0 8))
((wazzup) info))) ((wazzup) info)))
(defun magit-manual-merge (revision) (defun magit-manual-merge (revision)