chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
074eb3f
)
tg.sh: Avoid use of non-SUS 'echo -e'
author
Petr Baudis
<pasky@suse.cz>
Mon, 11 Aug 2008 16:59:52 +0000
(18:59 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Mon, 11 Aug 2008 16:59:52 +0000
(18:59 +0200)
tg.sh
patch
|
blob
|
history
diff --git
a/tg.sh
b/tg.sh
index a844b5ed2828a27d8018955913474bb5274040ed..16940f8de6d2dde6fdbf3633cb2a436de50b3e20 100644
(file)
--- a/
tg.sh
+++ b/
tg.sh
@@
-47,8
+47,8
@@
setup_ours()
{
if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
{
{
if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
{
- echo
-e ".topmsg\t
merge=ours"
- echo
-e ".topdeps\t
merge=ours"
+ echo
".topmsg
merge=ours"
+ echo
".topdeps
merge=ours"
} >>"$git_dir/info/attributes"
fi
if ! git config merge.ours.driver >/dev/null; then
} >>"$git_dir/info/attributes"
fi
if ! git config merge.ours.driver >/dev/null; then