learn git again. Git is a free software, i think free software and GNO norm is perfect,i love it.i Git is free software distributed under the GPL, the GPL standard let me thought a very equal word. And i add this sentence just want to use the "git diff" order and simple. try reset TEST merge