search

max630 / git-rehi

git-rehi, history editor
https://github.com/max630/git-rehi/wiki
GNU General Public License v2.0
3 stars 0 forks source link

??? in subject #53

Open max630 opened 7 years ago

max630 commented 7 years ago

history: A-B(merge)-C-D(merge)-...

  1. conslict in B; merge B^2 with A, resolving conflict, the merge result instead of B, then continue
  2. conflict in D
  3. rehi --current result: can see "???s" expected: can see subject

maybe specific to Win

max630 commented 7 years ago

foo

max630 commented 7 years ago

foo