merge script: tweak unmerged files message to match builtin
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 17 Aug 2010 07:03:36 +0000 (02:03 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:02:04 +0000 (14:02 -0700)
commit64048d6...0b4810125493ff0a2bab88cb12344e7f
tree085a6fe...1340ca909937b8cab2d3eedb4d7339c0copy hash to clipboard (tree)
parent22e0560...70f4b5bfbbf571647e03fa154a6d6bd1copy hash to clipboard (diff)
contrib/examples/git-merge.sh