From c35a45e80239652e8fc5f528292a1ea458d61d7c Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Fri, 8 Aug 2008 08:43:17 +0200 Subject: [PATCH 1/1] tg.sh: it's info/attributes not info/gitattributes The merge attribute hasn't any effect, because the wrong attribute file was used. Signed-off-by: Bert Wesarg Signed-off-by: Petr Baudis --- tg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tg.sh b/tg.sh index ead2361..c5c71a2 100644 --- a/tg.sh +++ b/tg.sh @@ -45,11 +45,11 @@ setup_hook() # setup_ours (no arguments) setup_ours() { - if [ ! -s "$git_dir/info/gitattributes" ] || ! grep -q topmsg "$git_dir/info/gitattributes"; then + if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then { echo -e ".topmsg\tmerge=ours" echo -e ".topdeps\tmerge=ours" - } >>"$git_dir/info/gitattributes" + } >>"$git_dir/info/attributes" fi if ! git config merge.ours.driver >/dev/null; then git config merge.ours.name '"always keep ours" merge driver' -- 2.30.2