Google Git
Sign in
googlers / jrn / git / 5891c76cd012536a5bb833e512f7262a4b4358c1 / t / t7605-merge-resolve.sh
  1. 40d7194 builtin/merge.c: fix a bug with trivial merges by Elijah Newren · 9 years ago
  2. ef7d362 t7605: add a testcase demonstrating a bug with trivial merges by Elijah Newren · 9 years ago
  3. 47a528a tests: use "git xyzzy" form (t7200 - t9001) by Nanako Shiraishi · 17 years ago
  4. 446247d merge: fix numerus bugs around "trivial merge" area by Junio C Hamano · 17 years ago
  5. 3f4d1c6 Add a new test for git-merge-resolve by Miklos Vajna · 17 years ago