这是一个XML的Diff/Merge工具，可以用来做git的merge driver。
原工程在 这里
我改了一版，可以在Windows + cygwin下运行。
-
生成patch文件：
3dm -d <base> <branch1> [output] -
应用patch文件：
3dm -p <base> <patch> [output] -
3-way merge:
3dm -m <base> <branch1> <branch2> [output]
-
Notifications
You must be signed in to change notification settings - Fork 1
The "3dm" XML diff & merge tool
License
JiangYouxin/3dm
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
The "3dm" XML diff & merge tool
Resources
License
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published