[orion-dev] Orion git merge test cases

[Libing Wang <Libing_Wang@xxxxxxxxxx>]

I've created test
cases  in wiki page on how
to resolve merge conflicts in M7.
As Boris mentioned at last week's meeting
, you can use it as a  test path on git merge. You can also use the
steps to get familiar with a full cycle of git usage and the writable compare
editor  as self-hosting in M7.
Currently JGit has a bug
in file deletion case , I am still trying to work around this in the UI
on git status and compare editor . I will update test case 2 and 3 after
this is done.

Regards,
Libing