Syed zainul abedin 6a4b1e2823 Conflict watcher updated 2 months ago
..
MergeActions e03822afb2 Updated git merge modification for selective application 2 months ago
Resources e03822afb2 Updated git merge modification for selective application 2 months ago
Utilities ad978c4e3d Added base git merge 2 months ago
VCS ad978c4e3d Added base git merge 2 months ago
.DS_Store e03822afb2 Updated git merge modification for selective application 2 months ago
ConflictWatcher.cs 6a4b1e2823 Conflict watcher updated 2 months ago
ConflictWatcher.cs.meta e03822afb2 Updated git merge modification for selective application 2 months ago
GameObjectMergeActions.cs e03822afb2 Updated git merge modification for selective application 2 months ago
GameObjectMergeActions.cs.meta ad978c4e3d Added base git merge 2 months ago
GitMergeWindow.cs e03822afb2 Updated git merge modification for selective application 2 months ago
GitMergeWindow.cs.meta ad978c4e3d Added base git merge 2 months ago
MergeActions.meta ad978c4e3d Added base git merge 2 months ago
MergeManagerBase.cs e03822afb2 Updated git merge modification for selective application 2 months ago
MergeManagerBase.cs.meta ad978c4e3d Added base git merge 2 months ago
MergeManagerPrefab.cs ad978c4e3d Added base git merge 2 months ago
MergeManagerPrefab.cs.meta ad978c4e3d Added base git merge 2 months ago
MergeManagerScene.cs ad978c4e3d Added base git merge 2 months ago
MergeManagerScene.cs.meta ad978c4e3d Added base git merge 2 months ago
ObjectDictionaries.cs ad978c4e3d Added base git merge 2 months ago
ObjectDictionaries.cs.meta ad978c4e3d Added base git merge 2 months ago
Resources.cs ad978c4e3d Added base git merge 2 months ago
Resources.cs.meta ad978c4e3d Added base git merge 2 months ago
Resources.meta ad978c4e3d Added base git merge 2 months ago
ThirteenPixels.GitMerge.asmdef ad978c4e3d Added base git merge 2 months ago
ThirteenPixels.GitMerge.asmdef.meta ad978c4e3d Added base git merge 2 months ago
Utilities.meta ad978c4e3d Added base git merge 2 months ago
VCS.meta ad978c4e3d Added base git merge 2 months ago