This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new ca49a1e Add merge tracking
ca49a1e is described below
commit ca49a1e7179967b58c77010615af185c5635e611
Author: Daniel Kulp <[email protected]>
AuthorDate: Thu Jun 28 12:27:13 2018 +0200
Add merge tracking
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
new file mode 100644
index 0000000..5a74289
--- /dev/null
+++ b/.gitmergeinfo
@@ -0,0 +1 @@
+origin/master