master@{1393911103}  ...  master Edit From here you can compare , discuss, and merge two