merge: force edit and no-ff mode when merging a tag object
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Nov 2011 00:29:34 +0000 (16:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Nov 2011 18:29:42 +0000 (10:29 -0800)
commitfab47d0...7559301c74d6642576694fd251a3fd11
treefc15537...e16edab4ae239e86c509ad3fc05c716ccopy hash to clipboard (tree)
parent5231c63...f2e54723d53a8cd928d9bc98b39dc35fcopy hash to clipboard (diff)
builtin/merge.c