| commit | 20f63f80795920da1ab47f23ba1fce4352165906 | |
| author | Frank Li <lznuaa@gmail.com> | |
| Fri, 11 Sep 2009 15:52:57 +0000 (11 23:52 +0800) | ||
| committer | Frank Li <lznuaa@gmail.com> | |
| Fri, 11 Sep 2009 15:52:57 +0000 (11 23:52 +0800) | ||
| tree | 653a3145fb4fdb292b228878ca9b15b0482875d1 | treesnapshot (tar.gz zip) |
| parent | b3b573ebd8c34f4f2a3c972d974e5e1bb3200c20 | commitdiff |
Fixed issue #163: Conflict "theirs" and "mine" are reversed during a rebase
Rebase cherry pick current branch to upstream.
So it need revert my version and their version at conflict editor
Signed-off-by: Frank Li <lznuaa@gmail.com>
Rebase cherry pick current branch to upstream.
So it need revert my version and their version at conflict editor
Signed-off-by: Frank Li <lznuaa@gmail.com>