clear file1
a b c
+ d e f
+ j h i
+ k   l   m   ----
- mergecommit