| author | Daniel Barkalow <barkalow@iabervon.org> |
|---|---|
| Sun, 25 Sep 2005 03:50:04 +0000 (23:50 -0400) | |
| committer | Junio C Hamano <junkio@cox.net> |
| Sun, 25 Sep 2005 05:05:55 +0000 (22:05 -0700) | |
| commit | 7061f5c...c5fdde49a952db9dfe09bcfd8b8f9794 |
| tree | 572ada7...126f8bfad8a9fb914d2f85d4a82c6b35 (tree) |
| parent | c3bc895...81b6ec6906be7e6739edb4a50eecf6e9 (diff) |
| Documentation/technical/trivial-merge.txt | diff | blob | history |