[denny@Rayark tmpd](master)$ git merge -Xoctopus branch1  branch2 
Trying simple merge with branch1
Trying simple merge with branch2
Merge made by the 'octopus' strategy.
 file_at_branch1 | 0
 file_at_branch2 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 file_at_branch1
 create mode 100644 file_at_branch2