Show usage string for 'git merge-one-file -h'
commitae5bdda36cddeb837dc43804966bc99baa385772
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 9 Nov 2009 15:04:53 +0000 (9 09:04 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 19:06:57 +0000 (10 11:06 -0800)
tree219eb86d11b1bf4ad79a58eb69db460ebb4ae0e4
parentaa481d38b059a093829bbe0745e29244a896c499
Show usage string for 'git merge-one-file -h'

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-merge-one-file.sh