| 2011-05-06 | Merge branch 'im/hashcmp-optim' | blob | diff | raw | |
| 2011-05-06 | Merge branch 'jk/merge-one-file-working-tree' | blob | diff | raw | |
| 2011-05-06 | Merge branch 'jc/fix-diff-files-unmerged' | blob | diff | raw | |
| 2011-04-24 | diff-files: show unmerged entries correctly | blob | diff | raw | |