From: Kevin Bracey Date: Sun, 24 Mar 2013 12:26:22 GMT Subject: [PATCH v2 0/3] git-merge-one-file error reporting Message-ID: <1364127985-13366-1-git-send-email-kevin@bracey.fi> In-Reply-To: Style clean up, as requested, followed by the fix to the "both sides added" handling for git-merge-one-file. This is based on v4 of my p4merge series, as they touch the same area. Kevin Bracey (3): git-merge-one-file: style cleanup git-merge-one-file: send "ERROR:" messages to stderr git-merge-one-file: revise merge error reporting git-merge-one-file.sh | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) -- 1.8.2.rc3.21.g744ac65