merge: match the help text with the documentation
authorJared Hance <jaredhance@gmail.com>
Thu, 10 Feb 2011 23:52:41 +0000 (18:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2011 07:09:51 +0000 (00:09 -0700)
commitc395c25...8642893dd1bb4be1fd124dd12f9b848c
tree5dcc2fc...57a4d46e694aef9d75807906a5e804cdcopy hash to clipboard (tree)
parent7811d96...0f02e70c9f835719c71156c967a684f7copy hash to clipboard (diff)
builtin/merge.c