Julien Letessier mezis

## git-merge-po.sh
#!/bin/sh
#
# *******************************************
# WARNING: this does *not* handle 3-way merges properly.
# Anything modified on the local branch since the common base will get ignored.
#
# FOR ANYONE LANDING HERE:
# This script is now updated as part of the git-whistles gem.
# https://github.com/mezis/git-whistles
# *******************************************
	#!/bin/sh
	#
	# *******************************************
	# WARNING: this does not handle 3-way merges properly.
	# Anything modified on the local branch since the common base will get ignored.
	#
	# FOR ANYONE LANDING HERE:
	# This script is now updated as part of the git-whistles gem.
	# https://github.com/mezis/git-whistles
	# *******************************************