aboutsummaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
Commit message (Expand)AuthorAge
* merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
* Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-24
|\
| * ll-merge: pass the original path to external driversJunio C Hamano2015-06-04
* | t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-25
|/
* conflict-marker-size: add test and docsJunio C Hamano2010-01-20
* Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\
| * builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
* | tests: use "git xyzzy" form (t3600 - t6999)Nanako Shiraishi2008-09-03
|/
* Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-18
* Custom low-level merge driver support.Junio C Hamano2007-04-18
* Add a demonstration/test of customized merge.Junio C Hamano2007-04-17