X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=bugs%2Ftemplates%2Fmerge;fp=bugs%2Ftemplates%2Fmerge;h=98ab5b44b3a48c96668026e71943991819881e18;hp=0000000000000000000000000000000000000000;hb=e7d8b538a6914f5b4de25e2b10ecba834da7adcb;hpb=3a0848aa685d931533a1f26aa8d6fe20f07ad4b5

diff --git a/bugs/templates/merge b/bugs/templates/merge
new file mode 100644
index 0000000..98ab5b4
--- /dev/null
+++ b/bugs/templates/merge
@@ -0,0 +1,3 @@
+
+-- merged with %NAME% by %USER% on %TIMESTAMP%
+