diff --git a/.gitattributes b/.gitattributes
index 7f9492298..9ee6a94f2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,20 +10,20 @@
 *.uss text
 # --- Unity YAML 형식 에셋 (텍스트 기반) ---
 # 병합 품질 향상을 위해 Unity Smart Merge 드라이버 사용
-*.meta   text merge=unityyamlmerge eol=lf
-*.unity  text merge=unityyamlmerge eol=lf
-*.prefab text merge=unityyamlmerge eol=lf
-*.asset filter=lfs diff=lfs merge=lfs -text
-*.mat    text merge=unityyamlmerge eol=lf
-*.anim   text merge=unityyamlmerge eol=lf
-*.controller          text merge=unityyamlmerge eol=lf
-*.overrideController  text merge=unityyamlmerge eol=lf
-*.mask                text merge=unityyamlmerge eol=lf
-*.lighting            text merge=unityyamlmerge eol=lf
-*.renderTexture       text merge=unityyamlmerge eol=lf
-*.timeline            text merge=unityyamlmerge eol=lf
-*.playable            text merge=unityyamlmerge eol=lf
-*.spriteatlasv2       text merge=unityyamlmerge eol=lf
+*.meta   text merge=unityyamlmerge eol=lf -diff
+*.unity  text merge=unityyamlmerge eol=lf -diff
+*.prefab text merge=unityyamlmerge eol=lf -diff
+*.asset filter=lfs diff=lfs merge=lfs -text -diff
+*.mat    text merge=unityyamlmerge eol=lf -diff
+*.anim   text merge=unityyamlmerge eol=lf -diff
+*.controller          text merge=unityyamlmerge eol=lf -diff
+*.overrideController  text merge=unityyamlmerge eol=lf -diff
+*.mask                text merge=unityyamlmerge eol=lf -diff
+*.lighting            text merge=unityyamlmerge eol=lf -diff
+*.renderTexture       text merge=unityyamlmerge eol=lf -diff
+*.timeline            text merge=unityyamlmerge eol=lf -diff
+*.playable            text merge=unityyamlmerge eol=lf -diff
+*.spriteatlasv2       text merge=unityyamlmerge eol=lf -diff
 # 참고: 각자 로컬 Git에 merge.unityyamlmerge.driver를 등록해야 실제로 동작합니다.
 # --- Git LFS 관리 대상 바이너리 파일들 ---
 # 이미지