aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
Commit message (Expand)AuthorAge
* merge-file: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-15
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
* merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-20
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22