Google Git
Sign in
googlers / jrn / git / 78bce6c7e93f4c8797da06cf93f59b7ac8e84ec0 / Documentation / technical / trivial-merge.txt
  1. 7061f5c [PATCH] Finish documenting trivial merge rules by Daniel Barkalow · 19 years ago
  2. 3d89cb4 [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. by Daniel Barkalow · 20 years ago