Clarify the "manual merge recommended" message somewhat
authorAndreas Gruenbacher <agruen@suse.de>
Tue, 11 Aug 2009 16:48:58 +0000 (18:48 +0200)
committerAndreas Gruenbacher <agruen@suse.de>
Tue, 11 Aug 2009 16:48:58 +0000 (18:48 +0200)
commit1bd95518896908cd845864c7c428365a4fb8c7b2
tree8675fc3495ab6999ec893beca1cb2aa0f308bee0
parente6511c9066288b618e5404514a1e38868b04a92c
Clarify the "manual merge recommended" message somewhat
bsgit.py