Hello, I have a very strange issue described below:
* Here is the tree before I merge via `git log --format="%h %p %d" -n 20 --all --graph`: https://upaste.de/9Pe * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: a008c4d580 c61f96eb5d a274b6e7ca 67c1000ca3 * Here is the merge commands: git merge f087081868 # fix conflicts * Here is the tree after I merged via `git log --format="%h %p %d" -n 20 --all --graph`: https://upaste.de/8Bx * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: a274b6e7ca 67c1000ca3 67c1000ca3 00bd5c8c89
