![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Apr 2010 19:40:45 +0000 (12:40 -0700) |
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/git-branch.txt | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/git-branch.txt
Simple merge