From: Bert Wesarg Date: Fri, 08 Aug 2008 06:43:17 GMT Subject: [TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes Message-ID: <1218177797-21589-1-git-send-email-bert.wesarg@googlemail.com> The merge attribute hasn't any effect, because the wrong attribute file was used. Signed-off-by: Bert Wesarg --- tg.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tg.sh b/tg.sh index 03a392b..209b69e 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' -- tg: (e311d15..) t/its-info-attributes (depends on: master)