diff options
author | Kevin Bracey <kevin@bracey.fi> | 2013-03-24 14:26:24 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 10:50:31 -0700 |
commit | d401acf7036cf01d93d138239edf87a59f9627b4 (patch) | |
tree | 4c5ae176b6795567f28d672c38cf88383930c6d5 /userdiff.c | |
parent | 333ea38db95c77fad8b18daa80bbf0f96fee556c (diff) | |
download | git-d401acf7036cf01d93d138239edf87a59f9627b4.tar.gz git-d401acf7036cf01d93d138239edf87a59f9627b4.tar.xz |
git-merge-one-file: send "ERROR:" messages to stderr
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions