chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'refs/top-bases/debian/locations' into debian/locations
[topgit.git]
/
tg-update.sh
diff --git
a/tg-update.sh
b/tg-update.sh
index 040800d6fb3805ef92519e436fe9cbb353cdbb77..288ec14f849495734fec17b839abf678f366ad78 100644
(file)
--- a/
tg-update.sh
+++ b/
tg-update.sh
@@
-142,3
+142,5
@@
if ! git merge "$merge_with"; then
fi
exit 3
fi
fi
exit 3
fi
+
+# vim:noet